getting the path to phpunit from a preference page. added icons to progressComposite

[phpeclipse.git] / net.sourceforge.phpeclipse.phpunit / src / net / sourceforge / phpeclipse / phpunit / testpool / TestPool.java

diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
index 008cb3d..4ecdf4c 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/testpool/TestPool.java
@@ -7,8 +7,6 @@
 package net.sourceforge.phpeclipse.phpunit.testpool;
 
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Vector;
 
 
 /**
@@ -31,8 +29,7 @@ public class TestPool {
        public TestPool(String rootTitle) {
                
                tests = new HashMap();
-               root = new TestSuite(rootTitle, "-1", 0);
-               
+               root = null;            
                currentTestSuite = root;
                
        }
@@ -62,11 +59,19 @@ public class TestPool {
         */
        public void addTestSuite(TestSuite suite) {
        
-       //add as sibling
-               currentTestSuite.addTestSuite(suite);
-               suite.setParent(currentTestSuite);
-
-               currentTestSuite = suite;
+       
+       if(root == null) {
+               root = suite;
+       } 
+       else {
+       
+               //add as sibling        
+                       currentTestSuite.addTestSuite(suite);
+                       suite.setParent(currentTestSuite);
+
+       }       
+       
+               currentTestSuite = suite;       
        }
 
        /**
@@ -107,22 +112,12 @@ public class TestPool {
        
        }
 
-       private int countSuiteExpectedTests(TestSuite suite) {
-               
-               int total = 0;
-               
-               total += suite.getNumTestCasesExpected();
-               
-               for(int i = 0; i < suite.getTestSuites().size(); i++) 
-                       total += countSuiteExpectedTests((TestSuite) suite.getTestSuites().elementAt(i));
-               
-               return total;
-       
-       }
 
        public int getNumTestsOverall() {
        
-               return countSuiteExpectedTests(root);
+               int total = root.getNumTestCasesExpected();
+               System.out.println("total: " + total);
+               return total;
                                
        }
        
@@ -137,19 +132,19 @@ public class TestPool {
                
                int total = 0;
                
-               Iterator i = tests.keySet().iterator();
-               String key = "";
-               while (i.hasNext()) {
-                       
-                       
-                       key = (String) i.next();
-                       TestCase element = (TestCase) tests.get(key);
-                       
-                       
-                       if(element.isFailure())
-                               total++;
-                       
-               }
+//             Iterator i = tests.keySet().iterator();
+//             String key = "";
+//             while (i.hasNext()) {
+//                     
+//                     
+//                     key = (String) i.next();
+//                     TestCase element = (TestCase) tests.get(key);
+//                     
+//                     
+//                     if(element.isFailure())
+//                             total++;
+//                     
+//             }
                        
                return total;
        }