Tests passing, need to add command line

testng-team · Aug 22, 2010 · b7a8c39 · b7a8c39
1 parent fc77faa
commit b7a8c39
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/pom-test.xml b/pom-test.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.13.1</version>
+            <version>5.13.2-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
@@ -941,6 +941,7 @@ public List<ISuite> runSuitesLocally() {
         suiteRunnerWorkers.add(srw);
       }
 
+//      ThreadUtil.execute(suiteRunnerWorkers, 1, Integer.MAX_VALUE, true /* start now */);
       for (Runnable r : suiteRunnerWorkers) {
         r.run();
       }

diff --git a/src/main/java/org/testng/reporters/XMLReporter.java b/src/main/java/org/testng/reporters/XMLReporter.java
@@ -139,10 +139,12 @@ private Properties getSuiteAttributes(ISuite suite) {
         minStartDate = startDate;
       }
       if (maxEndDate == null || maxEndDate.before(endDate)) {
-        maxEndDate = endDate;
+        maxEndDate = endDate != null ? endDate : startDate;
       }
     }
 
+    // The suite could be completely empty
+    if (maxEndDate == null) maxEndDate = minStartDate;
     addDurationAttributes(config, props, minStartDate, maxEndDate);
     return props;
   }

diff --git a/src/test/java/test/thread/BaseThreadTest.java b/src/test/java/test/thread/BaseThreadTest.java
@@ -9,17 +9,18 @@
 public class BaseThreadTest extends SimpleBaseTest {
   static private Set<Long> m_threadIds;
 
-  protected void initThreadLog() {
+  static void initThreadLog() {
     m_threadIds = Sets.newHashSet();
   }
 
   protected void logThread(long threadId) {
     synchronized(m_threadIds) {
+      log("BaseThreadTest", "Logging thread:" + threadId);
       m_threadIds.add(threadId);
     }
   }
 
-  public static int getThreadCount() {
+  static int getThreadCount() {
     synchronized(m_threadIds) {
       return m_threadIds.size();
     }

diff --git a/src/test/resources/suite1-1.xml b/src/test/resources/suite1-1.xml
@@ -2,7 +2,10 @@
 
   <test name="Suite 1-1 Tests">
     <classes>
+<!-- 
       <class name="foo.bar.NonExistentClass"/>
+-->
+      <class name="test.sample.Sample1"/>
     </classes>
   </test>
 </suite>
diff --git a/src/test/resources/testng-single.xml b/src/test/resources/testng-single.xml
@@ -26,7 +26,7 @@
     </groups>
     <parameter name="count" value="10"/>
     <classes>
-      <class name="test.preserveorder.PreserveOrderTest"/>
+      <class name="test.thread.ParallelSuiteTest"/>
 <!-- 
       <class name="test.preserveorder.SibTest"/>
       <class name="test.preserveorder.EdnTest"/>

diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml
@@ -80,7 +80,10 @@
       <class name="test.thread.FactoryTest" />
       <class name="test.thread.DataProviderThreadPoolSizeTest" />
       <class name="test.thread.MultiThreadedDependentTest" />
-      <class name="test.simple.IncludedExcludedTest" />
+<!-- 
+      <class name="test.thread.ParallelSuiteTest"/>
+ -->
+       <class name="test.simple.IncludedExcludedTest" />
       <class name="test.reports.ReportTest" />
       <class name="test.annotationtransformer.AnnotationTransformerTest" />
       <class name="test.jar.JarTest" />