Cleanup test resources

bin/master.bat

@@ -1 +1 @@
-testng -hostfile test\hosts.properties -d test\test-output %1 %2 %3 %4 %5 test\testng.xml
+testng -hostfile hosts.properties -d test\test-output %1 %2 %3 %4 %5 test\testng.xml

testng-core/src/test/java/org/testng/JarFileUtilsTest.java

@@ -156,7 +156,7 @@ public Collection<XmlSuite> process(Collection<XmlSuite> suites) {
   }
 
   private static JarFileUtils newJarFileUtils(List<String> testNames) throws MalformedURLException {
-    return newJarFileUtils("jarfileutils/testng-tests.xml", testNames);
+    return newJarFileUtils("samples/jarfileutils/testng-tests.xml", testNames);
   }
 
   private static JarFileUtils newJarFileUtils(String suiteXmlName, List<String> testNames)

testng-core/src/test/java/org/testng/jarfileutils/JarCreator.java

@@ -44,11 +44,11 @@ private static Class<?>[] getTestClasses() {
 
   private static String[] getResources() {
     return new String[] {
-      "jarfileutils/testng-tests.xml",
-      "jarfileutils/child.xml",
-      "jarfileutils/child/child.xml",
-      "jarfileutils/child/childofchild/childofchild.xml",
-      "jarfileutils/childofchild/childofchild.xml"
+      "samples/jarfileutils/testng-tests.xml",
+      "samples/jarfileutils/child.xml",
+      "samples/jarfileutils/child/child.xml",
+      "samples/jarfileutils/child/childofchild/childofchild.xml",
+      "samples/jarfileutils/childofchild/childofchild.xml"
     };
   }
 }

testng-core/src/test/java/org/testng/xml/ParserTest.java

@@ -9,7 +9,7 @@
 
 public class ParserTest {
 
-  private static final String XML_FILE_NAME = "src/test/resources/a.xml";
+  private static final String XML_FILE_NAME = "src/test/resources/samples/a.xml";
 
   @Test(dataProvider = "dp")
   public void testParsing(String file) throws Exception {

testng-core/src/test/java/org/testng/xml/SuiteXmlParserTest.java

@@ -10,7 +10,7 @@
 
 public class SuiteXmlParserTest {
 
-  private static final File PARENT = new File(getPathToResource("xml"));
+  private static final File PARENT = new File(getPathToResource("samples/xml"));
 
   @DataProvider
   private static Object[][] dp() {

testng-core/src/test/java/org/testng/xml/XmlSuiteTest.java

@@ -63,7 +63,7 @@ public Object[][] getData() {
   @Test(description = "GITHUB-1668")
   public void ensureNoExceptionsAreRaisedWhenMethodSelectorsDefinedAtSuiteLevel()
       throws IOException {
-    Parser parser = new Parser("src/test/resources/xml/issue1668.xml");
+    Parser parser = new Parser("src/test/resources/samples/xml/issue1668.xml");
     List<XmlSuite> suites = parser.parseToList();
     XmlSuite xmlsuite = suites.get(0);
     TestNG testNG = create();
@@ -76,7 +76,7 @@ public void ensureNoExceptionsAreRaisedWhenMethodSelectorsDefinedAtSuiteLevel()
 
   @Test(description = "GITHUB-435")
   public void ensureSuiteLevelPackageIsAppliedToAllTests() throws IOException {
-    Parser parser = new Parser("src/test/resources/xml/issue435.xml");
+    Parser parser = new Parser("src/test/resources/samples/xml/issue435.xml");
     List<XmlSuite> suites = parser.parseToList();
     XmlSuite xmlsuite = suites.get(0);
     assertThat(xmlsuite.getTests().get(0).getClasses().size()).isEqualTo(0);
@@ -93,7 +93,7 @@ public void ensureSuiteLevelBeanshellIsAppliedToAllTests() throws IOException {
     StringOutputStream stream = new StringOutputStream();
     try {
       System.setOut(new PrintStream(stream));
-      Parser parser = new Parser("src/test/resources/xml/issue1674.xml");
+      Parser parser = new Parser("src/test/resources/samples/xml/issue1674.xml");
       List<XmlSuite> suites = parser.parseToList();
       XmlSuite xmlsuite = suites.get(0);
       assertThat(xmlsuite.getTests().get(0).getMethodSelectors().size()).isEqualTo(0);

testng-core/src/test/java/test/CheckSuitesInitializationTest.java

@@ -29,7 +29,7 @@ public class CheckSuitesInitializationTest extends SimpleBaseTest {
   public void check() {
     TestListenerAdapter tla = new TestListenerAdapter();
     TestNG tng = create();
-    String testngXmlPath = getPathToResource("checksuitesinitialization/parent-suite.xml");
+    String testngXmlPath = getPathToResource("samples/checksuitesinitialization/parent-suite.xml");
     tng.setTestSuites(Collections.singletonList(testngXmlPath));
     tng.addListener(tla);
     tng.run();

testng-core/src/test/java/test/SimpleBaseTest.java

@@ -10,11 +10,7 @@
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.regex.Pattern;
 import org.testng.Assert;
 import org.testng.ITestNGMethod;
@@ -55,6 +51,19 @@ public static InvokedMethodNameListener run(XmlSuite... suites) {
     return run(false, suites);
   }
 
+  public static InvokedMethodNameListener runFromSuite(String... suites) {
+    TestNG tng = create();
+    List<String> testSuites = new ArrayList<>();
+    for (String suite : suites) {
+      testSuites.add(getPathToResource(suite));
+    }
+    tng.setTestSuites(testSuites);
+    InvokedMethodNameListener listener = new InvokedMethodNameListener();
+    tng.addListener(listener);
+    tng.run();
+    return listener;
+  }
+
   public static InvokedMethodNameListener run(boolean skipConfiguration, XmlSuite... suites) {
     TestNG tng = create(suites);
 

testng-core/src/test/java/test/commandline/CommandLineOverridesXml.java

@@ -55,7 +55,7 @@ private void runTest(String group, String excludedGroups, List<String> methods)
   @Test
   public void ensureThatParallelismAndThreadCountAreRallied() {
     TestNG testng = create();
-    testng.setTestSuites(Collections.singletonList("src/test/resources/987.xml"));
+    testng.setTestSuites(Collections.singletonList("src/test/resources/samples/987.xml"));
     testng.setThreadCount(2);
     testng.setParallel(XmlSuite.ParallelMode.METHODS);
     testng.run();

testng-core/src/test/java/test/configurationfailurepolicy/FailurePolicyTest.java

@@ -137,7 +137,7 @@ public void commandLineTestWithXMLFile_policyAsSkip() {
           OutputDirectoryPatch.getOutputDirectory(),
           "-configfailurepolicy",
           "skip",
-          getPathToResource("testng-configfailure.xml")
+          getPathToResource("samples/testng-configfailure.xml")
         };
     TestListenerAdapter tla = new TestListenerAdapter();
     TestNG.privateMain(argv, tla);
@@ -155,7 +155,7 @@ public void commandLineTestWithXMLFile_policyAsContinue() {
           OutputDirectoryPatch.getOutputDirectory(),
           "-configfailurepolicy",
           "continue",
-          getPathToResource("testng-configfailure.xml")
+          getPathToResource("samples/testng-configfailure.xml")
         };
     TestListenerAdapter tla = new TestListenerAdapter();
     TestNG.privateMain(argv, tla);

testng-core/src/test/java/test/github1417/TestParamsInjectionInBeforeClass.java

@@ -10,7 +10,7 @@
 public class TestParamsInjectionInBeforeClass {
   @Test
   public void testMethod() {
-    String suite = "src/test/resources/parametertest/1417.xml";
+    String suite = "src/test/resources/samples/parametertest/1417.xml";
     TestNG testNG = new TestNG();
     testNG.setTestSuites(Collections.singletonList(suite));
     testNG.run();

testng-core/src/test/java/test/groupinvocation/GroupSuiteTest.java

@@ -19,7 +19,7 @@
 /** Test that <suite> tags can have g. */
 public class GroupSuiteTest extends SimpleBaseTest {
 
-  private static final File PARENT = new File(getPathToResource("groupinvocation"));
+  private static final File PARENT = new File(getPathToResource("samples/groupinvocation"));
 
   @DataProvider
   private static Object[][] dp() {

testng-core/src/test/java/test/guice/GuiceParentModuleTest.java → testng-core/src/test/java/test/guice/GuiceParentModuleSample.java

@@ -8,7 +8,7 @@
 
 @Test
 @Guice(modules = GuiceTestModule.class)
-public class GuiceParentModuleTest {
+public class GuiceParentModuleSample {
   @Inject MySession mySession;
   @Inject MyService myService;
   @Inject ITestContext context;

testng-core/src/test/java/test/guice/GuiceTest.java

@@ -3,9 +3,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
+import org.testng.Assert;
+import org.testng.TestListenerAdapter;
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 import org.testng.xml.XmlSuite;
+import test.InvokedMethodNameListener;
 import test.SimpleBaseTest;
 import test.guice.issue2343.Person;
 import test.guice.issue2343.SampleA;
@@ -18,6 +21,8 @@
 import test.guice.issue2427.modules.TestModuleTwo;
 import test.guice.issue2427.modules.TestParentConfigModule;
 
+import java.util.Collections;
+
 public class GuiceTest extends SimpleBaseTest {
 
   @Test
@@ -77,4 +82,10 @@ public void ensureConfigureMethodCalledOnceForModule() {
     assertEquals(TestModuleOne.counter.get(), 1, "TestModuleOne configuration called times");
     assertEquals(TestModuleTwo.counter.get(), 1, "TestModuleTwo configuration called times");
   }
+
+  @Test
+  public void guiceParentModuleTest() {
+    InvokedMethodNameListener listener = runFromSuite("samples/parent-module-suite.xml");
+    assertThat(listener.getSucceedMethodNames()).containsExactly("testService");
+  }
 }

testng-core/src/test/java/test/jarpackages/JarPackagesTest.java

@@ -26,7 +26,7 @@ private TestListenerAdapter init(String jarFile) {
 
   @Test
   public void jarWithTestngXml() {
-    TestListenerAdapter tla = init("withtestngxml.jar");
+    TestListenerAdapter tla = init("samples/withtestngxml.jar");
     Assert.assertEquals(tla.getPassedTests().size(), 2);
     String first = tla.getPassedTests().get(0).getName();
     String second = tla.getPassedTests().get(1).getName();
@@ -37,7 +37,7 @@ public void jarWithTestngXml() {
 
   @Test
   public void jarWithoutTestngXml() {
-    TestListenerAdapter tla = init("withouttestngxml.jar");
+    TestListenerAdapter tla = init("samples/withouttestngxml.jar");
     Assert.assertEquals(tla.getPassedTests().size(), 2);
     String first = tla.getPassedTests().get(0).getName();
     String second = tla.getPassedTests().get(1).getName();

testng-core/src/test/java/test/listeners/ExecutionListenerAndSuiteListenerTest.java

@@ -12,7 +12,7 @@ public class ExecutionListenerAndSuiteListenerTest extends SimpleBaseTest {
 
   @Test
   public void executionListenerAndSuiteListenerTest() {
-    String suiteFile = getPathToResource("executionlistenersingletoncheck/parent.xml");
+    String suiteFile = getPathToResource("samples/executionlistenersingletoncheck/parent.xml");
     List<XmlSuite> suites = getSuites(suiteFile);
     TestNG testng = new TestNG();
     testng.setXmlSuites(suites);

testng-core/src/test/java/test/listeners/ListenerInXmlTest.java

@@ -11,7 +11,7 @@ public class ListenerInXmlTest extends SimpleBaseTest {
   @Test(description = "Make sure that listeners defined in testng.xml are invoked")
   public void listenerInXmlShouldBeInvoked() {
     TestNG tng = create();
-    tng.setTestSuites(Arrays.asList(getPathToResource("listener-in-xml.xml")));
+    tng.setTestSuites(Arrays.asList(getPathToResource("samples/listener-in-xml.xml")));
     LListener.invoked = false;
     tng.run();
     Assert.assertTrue(LListener.invoked);

testng-core/src/test/java/test/listeners/github1284/TestListeners.java

@@ -13,7 +13,7 @@ public void verifyWithoutListener() {
     TestNG testNG = create();
     testNG.setTestSuites(
         Collections.singletonList(
-            getPathToResource("test/listeners/github1284/github1284_nolistener.xml")));
+            getPathToResource("samples/test/listeners/github1284/github1284_nolistener.xml")));
     testNG.run();
     Assert.assertEquals(testNG.getStatus(), 0);
   }
@@ -23,7 +23,7 @@ public void verifyWithListener() {
     TestNG testNG = create();
     testNG.setTestSuites(
         Collections.singletonList(
-            getPathToResource("test/listeners/github1284/github1284_withlistener.xml")));
+            getPathToResource("samples/test/listeners/github1284/github1284_withlistener.xml")));
     testNG.run();
     Assert.assertEquals(testNG.getStatus(), 0);
   }
@@ -32,7 +32,7 @@ public void verifyWithListener() {
   public void verifyWithChildSuite() {
     TestNG testNG = create();
     testNG.setTestSuites(
-        Collections.singletonList(getPathToResource("test/listeners/github1284/github1284.xml")));
+        Collections.singletonList(getPathToResource("samples/test/listeners/github1284/github1284.xml")));
     testNG.run();
     Assert.assertEquals(testNG.getStatus(), 0);
   }

testng-core/src/test/java/test/methodinterceptors/multipleinterceptors/MultipleInterceptorsTest.java

@@ -29,7 +29,7 @@ public void testMultipleInterceptorsWithPreserveOrder() {
     tng.setTestSuites(
         Collections.singletonList(
             getPathToResource(
-                "/methodinterceptors/multipleinterceptors/multiple-interceptors.xml")));
+                "/samples/methodinterceptors/multipleinterceptors/multiple-interceptors.xml")));
     TestListenerAdapter tla = new TestListenerAdapter();
     tng.addListener((ITestNGListener) tla);
     tng.run();

testng-core/src/test/java/test/methodselectors/CommandLineTest.java

@@ -129,7 +129,7 @@ public void commandLineNoTest1Selector() {
   public void commandLineTestWithXmlFile() {
     ppp("commandLineTestWithXmlFile()");
     ARG_WITHOUT_CLASSES[5] = "test.methodselectors.NoTest1MethodSelector:5";
-    ARG_WITHOUT_CLASSES[6] = getPathToResource("testng-methodselectors.xml");
+    ARG_WITHOUT_CLASSES[6] = getPathToResource("samples/testng-methodselectors.xml");
     TestNG.privateMain(ARG_WITHOUT_CLASSES, tla);
     String[] passed = {"test2", "test3"};
     String[] failed = {};
@@ -142,7 +142,7 @@ public void testOverrideExcludedMethodsCommandLineExclusions() {
     ppp("testOverrideExcludedMethodsCommandLineExclusions");
     String[] args =
         new String[] {
-          "src/test/resources/test/methodselectors/sampleTest.xml",
+          "src/test/resources/samples/test/methodselectors/sampleTest.xml",
           "-log",
           "0",
           "-d",
@@ -166,7 +166,7 @@ public void testOverrideExcludedMethodsSuiteExclusions() {
     ppp("testOverrideExcludedMethodsSuiteExclusions");
     String[] args =
         new String[] {
-          "src/test/resources/test/methodselectors/sampleTestExclusions.xml",
+          "src/test/resources/samples/test/methodselectors/sampleTestExclusions.xml",
           "-log",
           "0",
           "-d",

testng-core/src/test/java/test/methodselectors/MethodSelectorInSuiteTest.java

@@ -49,7 +49,7 @@ public void programmaticXmlSuite() {
   @Test
   public void xmlXmlSuite() {
     TestNG tng = create();
-    tng.setTestSuites(Collections.singletonList(getPathToResource("methodselector-in-xml.xml")));
+    tng.setTestSuites(Collections.singletonList(getPathToResource("samples/methodselector-in-xml.xml")));
     tng.addListener((ITestNGListener) m_tla);
     tng.run();
 
@@ -62,7 +62,7 @@ public void fileOnCommandLine() {
         new String[] {
           "-d",
           OutputDirectoryPatch.getOutputDirectory(),
-          getPathToResource("methodselector-in-xml.xml")
+          getPathToResource("samples/methodselector-in-xml.xml")
         };
     TestNG.privateMain(args, m_tla);
 

testng-core/src/test/java/test/parameters/ParamInheritanceTest.java

@@ -23,7 +23,7 @@ public class ParamInheritanceTest extends SimpleBaseTest {
               + " during execution. This test makes sure we dont run into any NPEs")
   public void noNPEInCountingResults() {
     TestNG tng = create();
-    tng.setTestSuites(Arrays.asList(getPathToResource("param-inheritance/parent-suite.xml")));
+    tng.setTestSuites(Arrays.asList(getPathToResource("samples/param-inheritance/parent-suite.xml")));
 
     TestListenerAdapter tla = new TestListenerAdapter();
     tng.addListener((ITestNGListener) tla);
@@ -56,7 +56,7 @@ public void noNPEInCountingResults() {
   @Test(description = "Checks to make sure parameters are inherited and overridden properly")
   public void parameterInheritanceAndOverriding() {
     TestNG tng = create();
-    tng.setTestSuites(Arrays.asList(getPathToResource("parametertest/parent-suite.xml")));
+    tng.setTestSuites(Arrays.asList(getPathToResource("samples/parametertest/parent-suite.xml")));
 
     TestListenerAdapter tla = new TestListenerAdapter();
     tng.addListener((ITestNGListener) tla);

testng-core/src/test/java/test/reports/EmailableReporterTest.java

@@ -85,7 +85,7 @@ private void runTestViaMainMethod(String clazzName, String jvm) {
       output.getAbsolutePath(),
       "-reporter",
       clazzName + ":fileName=" + filename,
-      "src/test/resources/1332.xml"
+      "src/test/resources/samples/1332.xml"
     };
     try {
       if (jvm != null) {

testng-core/src/test/java/test/reports/FailedReporterTest.java

@@ -60,8 +60,8 @@ public void failedFile() throws ParserConfigurationException, SAXException, IOEx
   @Test(description = "ISSUE-2445")
   public void testParameterPreservationWithFactory() throws IOException {
     final SuiteXmlParser parser = new SuiteXmlParser();
-    final String testSuite = "src/test/resources/xml/github2445/test-suite.xml";
-    final String expectedResult = "src/test/resources/xml/github2445/expected-failed-report.xml";
+    final String testSuite = "src/test/resources/samples/xml/github2445/test-suite.xml";
+    final String expectedResult = "src/test/resources/samples/xml/github2445/expected-failed-report.xml";
     final XmlSuite xmlSuite = parser.parse(testSuite, new FileInputStream(testSuite), true);
     final TestNG tng = create(xmlSuite);
 

testng-core/src/test/java/test/sanitycheck/CheckSuiteNamesTest.java

@@ -21,7 +21,7 @@ public class CheckSuiteNamesTest extends SimpleBaseTest {
   public void checkChildSuites() {
     TestListenerAdapter tla = new TestListenerAdapter();
     TestNG tng = create();
-    String testngXmlPath = getPathToResource("sanitycheck/test-s-b.xml");
+    String testngXmlPath = getPathToResource("samples/sanitycheck/test-s-b.xml");
     tng.setTestSuites(Collections.singletonList(testngXmlPath));
     tng.addListener((ITestNGListener) tla);
     tng.run();
@@ -33,7 +33,7 @@ public void checkChildSuites() {
   public void checkChildSuitesFails() {
     TestListenerAdapter tla = new TestListenerAdapter();
     TestNG tng = create();
-    String testngXmlPath = getPathToResource("sanitycheck/test-s-a.xml");
+    String testngXmlPath = getPathToResource("samples/sanitycheck/test-s-a.xml");
     tng.setTestSuites(Collections.singletonList(testngXmlPath));
     tng.addListener((ITestNGListener) tla);
     tng.run();
@@ -72,7 +72,7 @@ public void checkProgrammaticSuitesFails() {
   @Test
   public void checkXmlSuiteAddition() throws IOException {
     TestNG tng = create();
-    String testngXmlPath = getPathToResource("sanitycheck/test-s-b.xml");
+    String testngXmlPath = getPathToResource("samples/sanitycheck/test-s-b.xml");
     Parser parser = new Parser(testngXmlPath);
     tng.setXmlSuites(parser.parseToList());
     tng.initializeSuitesAndJarFile();