diff -r 69f5314b6791 -r e46792d3fa86 java.j2seproject/nbproject/project.properties
--- a/java.j2seproject/nbproject/project.properties	Wed Feb 29 13:42:26 2012 +0100
+++ b/java.j2seproject/nbproject/project.properties	Tue Mar 13 13:56:32 2012 +0100
@@ -1,6 +1,6 @@
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 # Other names may be trademarks of their respective owners.
@@ -52,5 +52,6 @@
 test-unit-sys-prop.test.bridge.jar=${cluster}/ant/nblib/bridge.jar
 test-unit-sys-prop.test.ant.home=${cluster}/ant
 test-unit-sys-prop.test.junit.jar=${nb_all}/libs.junit4/external/junit-4.10.jar
+test-unit-sys-prop.test.testng.jar=${nb_all}/testng/external/testng-6.4.1beta.jar
 extra.module.files=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 jnlp.indirect.jars=ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
diff -r 69f5314b6791 -r e46792d3fa86 java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
--- a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl	Wed Feb 29 13:42:26 2012 +0100
+++ b/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl	Tue Mar 13 13:56:32 2012 +0100
@@ -2,7 +2,7 @@
 <!--
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
 
 Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 Other names may be trademarks of their respective owners.
@@ -72,9 +72,9 @@
   - execution
   - debugging
   - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
+  - test compilation
+  - test execution
+  - test debugging
   - applet
   - cleanup
 
@@ -352,6 +352,46 @@
                 <property name="jar.index.metainf" value="${{jar.index}}"/>
                 <property name="copylibs.rebase" value="true"/>
                 <available file="${{meta.inf.dir}}/persistence.xml" property="has.persistence.xml"/>
+                <condition property="junit.available">
+                    <or>
+                        <available classname="org.junit.Test" classpath="${{run.test.classpath}}"/>
+                        <available classname="junit.framework.Test" classpath="${{run.test.classpath}}"/>
+                    </or>
+                </condition>
+                <condition property="testng.available">
+                    <available classname="org.testng.annotations.Test" classpath="${{run.test.classpath}}"/>
+                </condition>
+                <condition property="junit+testng.available">
+                    <and>
+                        <isset property="junit.available"/>
+                        <isset property="testng.available"/>
+                    </and>
+                </condition>
+                <condition property="testng.mode" value="mixed" else="testng">
+                    <and>
+                        <isset property="junit+testng.available"/>
+                        <isset property="use.testng"/>
+                        <istrue value="${{use.testng}}"/>
+                    </and>
+                </condition>
+                <condition property="testng.debug.mode" value="-mixed" else="">
+                    <and>
+                        <isset property="junit+testng.available"/>
+                        <isset property="use.testng"/>
+                        <istrue value="${{use.testng}}"/>
+                    </and>
+                </condition>
+                <condition property="native.testing">
+                    <and>
+                        <isset property="junit+testng.available"/>
+                        <or>
+                            <not>
+                                <isset property="use.testng"/>
+                            </not>
+                            <isfalse value="${{use.testng}}"/>
+                        </or>
+                    </and>
+                </condition>
             </target>
 
             <target name="-post-init">
@@ -663,7 +703,7 @@
                 </macrodef>
             </target>
             
-            <target name="-init-macrodef-junit">
+            <target name="-init-macrodef-junit" if="junit.available">
                 <macrodef>
                     <xsl:attribute name="name">junit</xsl:attribute>
                     <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
@@ -679,6 +719,14 @@
                         <xsl:attribute name="name">testincludes</xsl:attribute>
                         <xsl:attribute name="default">**</xsl:attribute>
                     </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </element>
                     <sequential>
                         <property name="junit.forkmode" value="perTest"/>
                         <junit>
@@ -700,23 +748,485 @@
                                     <xsl:with-param name="excludes">@{excludes}</xsl:with-param>
                                 </xsl:call-template>
                             </batchtest>
-                            <classpath>
-                                <path path="${{run.test.classpath}}"/>
-                            </classpath>
                             <syspropertyset>
                                 <propertyref prefix="test-sys-prop."/>
                                 <mapper type="glob" from="test-sys-prop.*" to="*"/>
                             </syspropertyset>
                             <formatter type="brief" usefile="false"/>
                             <formatter type="xml"/>
-                            <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
                             <jvmarg value="-ea"/>
-                            <jvmarg line="${{run.jvmargs}}"/>
+                            <customize/>
                         </junit>
                     </sequential>
                 </macrodef>
             </target>
 
+            <target name="-init-macrodef-testng" if="testng.available">
+                <macrodef>
+                    <xsl:attribute name="name">testng</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">includes</xsl:attribute>
+                        <xsl:attribute name="default">${includes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">excludes</xsl:attribute>
+                        <xsl:attribute name="default">${excludes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testincludes</xsl:attribute>
+                        <xsl:attribute name="default">**</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </element>
+                    <sequential>
+                        <pathconvert pathsep="${{line.separator}}" property="testng.testincludes">
+                            <path>
+                                <filelist dir="${{build.test.classes.dir}}" files="@{{testincludes}}"/>
+                            </path>
+                            <chainedmapper>
+                                <globmapper from="*.java" to="*.class"/>
+                                <globmapper from="${{basedir}}/${{build.test.classes.dir}}/*" to="*"/>                    
+                            </chainedmapper>
+                        </pathconvert>
+                        <pathconvert pathsep="${{line.separator}}" property="testng.excludes">
+                            <path>
+                                <filelist dir="${{build.test.classes.dir}}" files="@{{excludes}}"/>
+                                <filelist dir="${{build.test.classes.dir}}" files="${{excludes}}"/>
+                            </path>
+                            <chainedmapper>
+                                <globmapper from="*.java" to="*.class"/>
+                                <globmapper from="${{basedir}}/${{build.test.classes.dir}}/*" to="*"/>
+                            </chainedmapper>
+                        </pathconvert>
+                        <pathconvert pathsep="${{line.separator}}" property="testng.includes">
+                            <path>
+                                <filelist dir="${{build.test.classes.dir}}" files="@{{includes}}"/>
+                            </path>
+                            <chainedmapper>
+                                <globmapper from="*.java" to="*.class"/>
+                                <globmapper from="${{basedir}}/${{build.test.classes.dir}}/*" to="*"/>
+                            </chainedmapper>
+                        </pathconvert>
+
+                        <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${{run.test.classpath}}"/>
+                        <testng>
+                            <xsl:attribute name="mode">${testng.mode}</xsl:attribute>
+                            <xsl:attribute name="enableAssert">true</xsl:attribute>
+                            <xsl:attribute name="workingDir">${work.dir}</xsl:attribute> <!-- #47474: match <java> --> 
+                            <xsl:attribute name="failureProperty">tests.failed</xsl:attribute>
+                            <xsl:attribute name="methods">@{testmethods}</xsl:attribute>
+                            <xsl:attribute name="outputdir">${build.test.results.dir}</xsl:attribute>
+                            <xsl:attribute name="suitename"><xsl:value-of select="$codename"/></xsl:attribute>
+                            <xsl:attribute name="testname">TestNG tests</xsl:attribute>
+                            <xsl:if test="/p:project/p:configuration/j2seproject3:data/j2seproject3:explicit-platform">
+                                <xsl:attribute name="jvm">${platform.java}</xsl:attribute>
+                            </xsl:if>
+                            <classfileset dir="${{build.test.classes.dir}}" excludes="${{testng.excludes}}" includes="${{testng.includes}}">
+                                <filename name="${{testng.testincludes}}"/>
+                            </classfileset>
+                            <propertyset>
+                                <propertyref prefix="test-sys-prop."/>
+                                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                            </propertyset>
+                            <customize/>
+                        </testng>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-junit-impl" depends="-init-macrodef-junit" unless="native.testing">
+                <macrodef>
+                    <xsl:attribute name="name">test-impl</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">includes</xsl:attribute>
+                        <xsl:attribute name="default">${includes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">excludes</xsl:attribute>
+                        <xsl:attribute name="default">${excludes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testincludes</xsl:attribute>
+                        <xsl:attribute name="default">**</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                        <xsl:attribute name="implicit">true</xsl:attribute>
+                    </element>
+                    <sequential>
+                        <j2seproject3:junit includes="@{{includes}}" excludes="@{{excludes}}" testincludes="@{{testincludes}}" testmethods="@{{testmethods}}">
+                            <customize/>
+                        </j2seproject3:junit>
+                    </sequential>
+                </macrodef>
+            </target>
+            
+            <target name="-init-macrodef-testng-impl" depends="-init-macrodef-testng" if="testng.available" unless="native.testing">
+                <macrodef>
+                    <xsl:attribute name="name">test-impl</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">includes</xsl:attribute>
+                        <xsl:attribute name="default">${includes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">excludes</xsl:attribute>
+                        <xsl:attribute name="default">${excludes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testincludes</xsl:attribute>
+                        <xsl:attribute name="default">**</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                        <xsl:attribute name="implicit">true</xsl:attribute>
+                    </element>
+                    <sequential>
+                        <j2seproject3:testng includes="@{{includes}}" excludes="@{{excludes}}" testincludes="@{{testincludes}}" testmethods="@{{testmethods}}">
+                            <customize/>
+                        </j2seproject3:testng>
+                    </sequential>
+                </macrodef>
+            </target>
+                        
+            <target name="-init-macrodef-test-nativeimpl" depends="-init-macrodef-junit,-init-macrodef-testng" if="native.testing">
+                <macrodef>
+                    <xsl:attribute name="name">test-impl</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">includes</xsl:attribute>
+                        <xsl:attribute name="default">${includes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">excludes</xsl:attribute>
+                        <xsl:attribute name="default">${excludes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testincludes</xsl:attribute>
+                        <xsl:attribute name="default">**</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <element>
+                        <xsl:attribute name="name">customize</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                        <xsl:attribute name="implicit">true</xsl:attribute>
+                    </element>
+                    <sequential>
+                        <union id="testng.testset">
+                            <xsl:call-template name="createFilesets">
+                                <xsl:with-param name="roots" select="/p:project/p:configuration/j2seproject3:data/j2seproject3:test-roots"/>
+                                <xsl:with-param name="includes">@{includes}</xsl:with-param>
+                                <xsl:with-param name="includes2">@{testincludes}</xsl:with-param>
+                                <xsl:with-param name="excludes">@{excludes}</xsl:with-param>
+                                <xsl:with-param name="condition">
+                                    <xsl:element name="contains">
+                                        <xsl:attribute name="text">
+                                            <xsl:text>org.testng.annotations.</xsl:text>
+                                        </xsl:attribute>
+                                    </xsl:element>
+                                </xsl:with-param>
+                            </xsl:call-template>
+                        </union>
+
+                        <union id="junit.testset">
+                            <xsl:call-template name="createFilesets">
+                                <xsl:with-param name="roots" select="/p:project/p:configuration/j2seproject3:data/j2seproject3:test-roots"/>
+                                <xsl:with-param name="includes">@{includes}</xsl:with-param>
+                                <xsl:with-param name="includes2">@{testincludes}</xsl:with-param>
+                                <xsl:with-param name="excludes">@{excludes}</xsl:with-param>
+                                <xsl:with-param name="condition">
+                                    <xsl:element name="not">
+                                        <xsl:element name="contains">
+                                            <xsl:attribute name="text">
+                                                <xsl:text>org.testng.annotations.</xsl:text>
+                                            </xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:element>
+                                </xsl:with-param>
+                            </xsl:call-template>
+                        </union>
+
+                        <pathconvert pathsep="," property="testng.tests" refid="testng.testset">
+                            <xsl:for-each select="/p:project/p:configuration/j2seproject3:data/j2seproject3:test-roots">
+                                <xsl:choose>
+                                    <xsl:when test="count(j2seproject3:root) > 1">
+                                        <compositemapper>
+                                            <xsl:for-each select="j2seproject3:root">
+                                                <xsl:element name="globmapper">
+                                                    <xsl:attribute name="from">
+                                                        <xsl:text>${basedir}/${</xsl:text>
+                                                        <xsl:value-of select="@id"/>
+                                                        <xsl:text>}/*</xsl:text>
+                                                    </xsl:attribute>
+                                                    <xsl:attribute name="to">
+                                                        <xsl:text>*</xsl:text>
+                                                    </xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:for-each>
+                                        </compositemapper>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:element name="globmapper">
+                                            <xsl:attribute name="from">
+                                                <xsl:text>${basedir}/${</xsl:text>
+                                                <xsl:value-of select="j2seproject3:root/@id"/>
+                                                <xsl:text>}/*</xsl:text>
+                                            </xsl:attribute>
+                                            <xsl:attribute name="to">
+                                                <xsl:text>*</xsl:text>
+                                            </xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:for-each>
+                        </pathconvert>
+                        <pathconvert pathsep="," property="junit.tests" refid="junit.testset">
+                            <xsl:for-each select="/p:project/p:configuration/j2seproject3:data/j2seproject3:test-roots">
+                                <xsl:choose>
+                                    <xsl:when test="count(j2seproject3:root) > 1">
+                                        <compositemapper>
+                                            <xsl:for-each select="j2seproject3:root">
+                                                <xsl:element name="globmapper">
+                                                    <xsl:attribute name="from">
+                                                        <xsl:text>${basedir}/${</xsl:text>
+                                                        <xsl:value-of select="@id"/>
+                                                        <xsl:text>}/*</xsl:text>
+                                                    </xsl:attribute>
+                                                    <xsl:attribute name="to">
+                                                        <xsl:text>*</xsl:text>
+                                                    </xsl:attribute>
+                                                </xsl:element>
+                                            </xsl:for-each>
+                                        </compositemapper>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:element name="globmapper">
+                                            <xsl:attribute name="from">
+                                                <xsl:text>${basedir}/${</xsl:text>
+                                                <xsl:value-of select="j2seproject3:root/@id"/>
+                                                <xsl:text>}/*</xsl:text>
+                                            </xsl:attribute>
+                                            <xsl:attribute name="to">
+                                                <xsl:text>*</xsl:text>
+                                            </xsl:attribute>
+                                        </xsl:element>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:for-each>
+                        </pathconvert>
+
+                        <j2seproject3:junit includes="@{{includes}}" excludes="@{{excludes}},${{testng.tests}}" testincludes="@{{testincludes}}" testmethods="@{{testmethods}}">
+                            <customize/>
+                        </j2seproject3:junit>
+                        <j2seproject3:testng includes="@{{includes}}" excludes="@{{excludes}},${{junit.tests}}" testincludes="@{{testincludes}}" testmethods="@{{testmethods}}">
+                            <customize/>
+                        </j2seproject3:testng>
+                    </sequential>
+                </macrodef>
+            </target>
+                        
+            <target name="-init-macrodef-test" depends="-init-macrodef-junit-impl,-init-macrodef-testng-impl,-init-macrodef-test-nativeimpl">
+                <macrodef>
+                    <xsl:attribute name="name">test</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">includes</xsl:attribute>
+                        <xsl:attribute name="default">${includes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">excludes</xsl:attribute>
+                        <xsl:attribute name="default">${excludes}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testincludes</xsl:attribute>
+                        <xsl:attribute name="default">**</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testmethods</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <j2seproject3:test-impl includes="@{{includes}}" excludes="@{{excludes}}" testincludes="@{{testincludes}}" testmethods="@{{testmethods}}">
+                            <customize>
+                                <classpath>
+                                    <path path="${{run.test.classpath}}"/>
+                                </classpath>
+                                <jvmarg line="${{endorsed.classpath.cmd.line.arg}}"/>
+                                <jvmarg line="${{run.jvmargs}}"/>
+                            </customize>
+                        </j2seproject3:test-impl>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-junit-debug" if="junit.available">
+                <macrodef>
+                    <xsl:attribute name="name">junit-debug</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testClass</xsl:attribute>
+                        <xsl:attribute name="default">${main.class}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testMethod</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <xsl:element name="element">
+                        <xsl:attribute name="name">customize2</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </xsl:element>
+                    <sequential>
+                        <property name="test.report.file" location="${{build.test.results.dir}}/TEST-@{{testClass}}.xml"/>
+                        <delete file="${{test.report.file}}"/>
+                        <mkdir dir="${{build.test.results.dir}}"/>
+                        <!--Ugly, puts ant and ant-junit to the test classpath, but there is probably no other solution how to run the XML formatter -->
+                        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${{ant.home}}/lib/ant.jar:${{ant.home}}/lib/ant-junit.jar:${{debug.test.classpath}}">
+                            <customize>
+                                <arg value="@{{testClass}}"/>
+                                <arg value="showoutput=true"/>
+                                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${{test.report.file}}"/>
+                                <customize2/>
+                            </customize>
+                        </j2seproject3:debug>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-junit-debug-impl" depends="-init-macrodef-junit-debug" if="junit.available">
+                <macrodef>
+                    <xsl:attribute name="name">test-debug-impl</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testClass</xsl:attribute>
+                        <xsl:attribute name="default">${main.class}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testMethod</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <xsl:element name="element">
+                        <xsl:attribute name="name">customize2</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                        <xsl:attribute name="implicit">true</xsl:attribute>
+                    </xsl:element>
+                    <sequential>
+                        <j2seproject3:junit-debug testClass="@{{testClass}}" testMethod="@{{testMethod}}">
+                            <customize2/>
+                        </j2seproject3:junit-debug>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-testng-debug" if="testng.available">
+                <macrodef>
+                    <xsl:attribute name="name">testng-debug</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testClass</xsl:attribute>
+                        <xsl:attribute name="default">${main.class}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testMethod</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <xsl:element name="element">
+                        <xsl:attribute name="name">customize2</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                    </xsl:element>
+                    <sequential>
+                        <condition property="test.class.or.method" value="-methods @{{testClass}}.@{{testMethod}}" else="-testclass @{{testClass}}">
+                            <isset property="@{{testMethod}}"/>
+                        </condition>
+                        <delete dir="${{build.test.results.dir}}" quiet="true"/>
+                        <mkdir dir="${{build.test.results.dir}}"/>
+                        <j2seproject3:debug classname="org.testng.TestNG" classpath="${{debug.test.classpath}}">
+                            <customize>
+                                <customize2/>
+                                <jvmarg value="-ea"/>
+                                <arg line="${{testng.debug.mode}}"/>
+                                <arg line="-d ${{build.test.results.dir}}"/>
+                                <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                                <arg line="-suitename {$codename}"/>
+                                <arg line="-testname @{{testClass}}"/>
+                                <arg line="${{test.class.or.method}}"/>
+                            </customize>
+                        </j2seproject3:debug>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-testng-debug-impl" depends="-init-macrodef-testng-debug" if="testng.available">
+                <macrodef>
+                    <xsl:attribute name="name">test-debug-impl</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testClass</xsl:attribute>
+                        <xsl:attribute name="default">${main.class}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testMethod</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <xsl:element name="element">
+                        <xsl:attribute name="name">customize2</xsl:attribute>
+                        <xsl:attribute name="optional">true</xsl:attribute>
+                        <xsl:attribute name="implicit">true</xsl:attribute>
+                    </xsl:element>
+                    <sequential>
+                        <j2seproject3:testng-debug testClass="@{{testClass}}" testMethod="@{{testMethod}}">
+                            <customize2/>
+                        </j2seproject3:testng-debug>
+                    </sequential>
+                </macrodef>
+            </target>
+
+            <target name="-init-macrodef-test-debug" depends="-init-macrodef-junit-debug-impl,-init-macrodef-testng-debug-impl">
+                <macrodef>
+                    <xsl:attribute name="name">test-debug</xsl:attribute>
+                    <xsl:attribute name="uri">http://www.netbeans.org/ns/j2se-project/3</xsl:attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testClass</xsl:attribute>
+                        <xsl:attribute name="default">${main.class}</xsl:attribute>
+                    </attribute>
+                    <attribute>
+                        <xsl:attribute name="name">testMethod</xsl:attribute>
+                        <xsl:attribute name="default"></xsl:attribute>
+                    </attribute>
+                    <sequential>
+                        <j2seproject3:test-debug-impl testClass="@{{testClass}}" testMethod="@{{testMethod}}">
+                            <customize2>
+                                <syspropertyset>
+                                    <propertyref prefix="test-sys-prop."/>
+                                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                                </syspropertyset>
+                            </customize2>
+                        </j2seproject3:test-debug-impl>
+                    </sequential>
+                </macrodef>
+            </target>
+
             <target name="profile-init" depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check"/>
 
             <target name="-profile-pre-init">
@@ -1012,7 +1522,7 @@
             </target>
 
             <target name="init">
-                <xsl:attribute name="depends">-pre-init,-init-private<xsl:if test="/p:project/p:configuration/libs:libraries/libs:definitions">,-init-libraries</xsl:if>,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline</xsl:attribute>
+                <xsl:attribute name="depends">-pre-init,-init-private<xsl:if test="/p:project/p:configuration/libs:libraries/libs:definitions">,-init-libraries</xsl:if>,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline</xsl:attribute>
             </target>
             
             <xsl:comment>
@@ -1628,7 +2138,7 @@
             
             <xsl:comment>
                 =========================
-                JUNIT COMPILATION SECTION
+                TEST COMPILATION SECTION
                 =========================
             </xsl:comment>
             
@@ -1736,7 +2246,7 @@
             
             <xsl:comment>
                 =======================
-                JUNIT EXECUTION SECTION
+                TEST EXECUTION SECTION
                 =======================
             </xsl:comment>
             
@@ -1749,7 +2259,7 @@
             <target name="-do-test-run">
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile-test,-pre-test-run</xsl:attribute>
-                <j2seproject3:junit testincludes="**/*Test.java"/>
+                <j2seproject3:test testincludes="**/*Test.java"/>
             </target>
             
             <target name="-post-test-run">
@@ -1794,7 +2304,7 @@
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile-test-single,-pre-test-run-single</xsl:attribute>
                 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-                <j2seproject3:junit includes="${{test.includes}}" excludes=""/>
+                <j2seproject3:test includes="${{test.includes}}" excludes="" testincludes="${{test.includes}}" />
             </target>
             
             <target name="-post-test-run-single">
@@ -1810,7 +2320,7 @@
             
             <xsl:comment>
                 =======================
-                JUNIT DEBUGGING SECTION
+                TEST DEBUGGING SECTION
                 =======================
             </xsl:comment>
             
@@ -1818,22 +2328,7 @@
                 <xsl:attribute name="if">have.tests</xsl:attribute>
                 <xsl:attribute name="depends">init,compile-test</xsl:attribute>
                 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-                <property name="test.report.file" location="${{build.test.results.dir}}/TEST-${{test.class}}.xml"/>
-                <delete file="${{test.report.file}}"/>
-                <mkdir dir="${{build.test.results.dir}}"/>
-                <!--Ugly, puts ant and ant-junit to the test classpath, but there is probably no other solution how to run the XML formatter -->
-                <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${{ant.home}}/lib/ant.jar:${{ant.home}}/lib/ant-junit.jar:${{debug.test.classpath}}">
-                    <customize>                        
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper type="glob" from="test-sys-prop.*" to="*"/>
-                        </syspropertyset>                        
-                        <arg value="${{test.class}}"/>
-                        <arg value="showoutput=true"/>
-                        <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                        <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${{test.report.file}}"/>
-                    </customize>
-                </j2seproject3:debug>
+                <j2seproject3:test-debug testClass="${{test.class}}" testMethod="${{methodname}}"/>
             </target>
             
             <target name="-debug-start-debugger-test">
@@ -2070,6 +2565,7 @@
         <xsl:param name="includes" select="'${includes}'"/>
         <xsl:param name="includes2"/>
         <xsl:param name="excludes"/>
+        <xsl:param name="condition"/>
         <xsl:for-each select="$roots/j2seproject3:root">
             <xsl:element name="fileset">
                 <xsl:attribute name="dir"><xsl:text>${</xsl:text><xsl:value-of select="@id"/><xsl:text>}</xsl:text></xsl:attribute>
@@ -2084,6 +2580,7 @@
                 </xsl:choose>
                 <xsl:if test="$includes2">
                     <filename name="{$includes2}"/>
+                    <xsl:copy-of select="$condition"/>
                 </xsl:if>
             </xsl:element>
         </xsl:for-each>
diff -r 69f5314b6791 -r e46792d3fa86 java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java
--- a/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java	Wed Feb 29 13:42:26 2012 +0100
+++ b/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/BuildImplTest.java	Tue Mar 13 13:56:32 2012 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
  * Other names may be trademarks of their respective owners.
@@ -90,6 +90,7 @@
     }
 
     private File junitJar;
+    private File testNGJar;
 
     @Override protected Level logLevel() {
         return Level.FINE;
@@ -105,6 +106,10 @@
         assertNotNull("must set test.junit.jar", junitJarProp);
         junitJar = new File(junitJarProp);
         assertTrue("file " + junitJar + " exists", junitJar.isFile());
+        String tngJarProp = System.getProperty("test.testng.jar");
+        assertNotNull("must set test.testng.jar", tngJarProp);
+        testNGJar = new File(tngJarProp);
+        assertTrue("file " + testNGJar + " exists", testNGJar.isFile());
         MockLookup.setLayersAndInstances(new IOP(), new IFL());
     }
 
@@ -156,7 +161,7 @@
 
     private Properties getProperties() {
         Properties p = new Properties();
-        p.setProperty("libs.junit.classpath", junitJar.getAbsolutePath());
+        p.setProperty("libs.junit.classpath", testNGJar.getAbsolutePath()  + ":" + junitJar.getAbsolutePath());
         return p;
     }
 
@@ -613,7 +618,8 @@
         p.setProperty("javac.includes", "pkg/SomeTest.java");
         p.setProperty("test.includes", "pkg/SomeTest.java");
         assertBuildSuccess(ActionUtils.runTarget(buildXml, new String[] {"test-single"}, p));
-        assertOutput("Testsuite: pkg.SomeTest");
+        assertTrue("wrong default suite name", output.contains("testRunSingleTestWithDep"));
+        assertTrue("wrong tests executed", output.contains("Total tests run: 1, Failures: 0, Skips: 0"));
     }
 
     public void testSubprojects() throws Exception {