new class to manage icons. Showing failures,etc on a test suite.

[phpeclipse.git] / net.sourceforge.phpeclipse.phpunit / src / net / sourceforge / phpeclipse / phpunit / PHPUnitView.java

diff --git a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
index 9f388dd..e304352 100644 (file)
--- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
+++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
@@ -6,8 +6,6 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 
 import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
@@ -15,8 +13,6 @@ import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -183,11 +179,6 @@ public class PHPUnitView extends ViewPart {
                final IActionBars actionBars = getViewSite().getActionBars();
                IToolBarManager toolBarManager = actionBars.getToolBarManager();
 
-               String iconsPath = "C:\\Documents and Settings\\Ali Echihabi\\My Documents\\workspace.eclipse2.1\\net.sourceforge.phpeclipse.phpunit\\icons";
-               
-               ImageDescriptor descriptor = null;
-               String icon = "";
-
                Action selectTestAction = new Action() {
                        
                        public void run() {
@@ -195,16 +186,10 @@ public class PHPUnitView extends ViewPart {
                                testSuiteToRun = dialog.open(); 
                        }
                };
+               
                selectTestAction.setText("Select Test Suite");
-               selectTestAction.setToolTipText("Select Test Suite");
-               try {
-                       icon = "tsuite.gif";
-                       descriptor = ImageDescriptor.createFromURL(new URL("file://" + iconsPath + "//" + icon));
-                       selectTestAction.setImageDescriptor(descriptor);
-               } catch (MalformedURLException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
-               }
+               selectTestAction.setToolTipText("Select Test Suite");           
+               selectTestAction.setImageDescriptor(PHPUnitImages.DESC_SELECT_TEST_SUITE);
                
                                
                toolBarManager.add(selectTestAction);
@@ -228,18 +213,11 @@ public class PHPUnitView extends ViewPart {
                        }
                        
                };
+               
                startTestAction.setText("Start Test");
                startTestAction.setToolTipText("Start Test Suite");
-
-               try {
-                       icon = "start.gif";
-                       descriptor = ImageDescriptor.createFromURL(new URL("file://" + iconsPath + "//" + icon));
-                       startTestAction.setImageDescriptor(descriptor);
-               } catch (MalformedURLException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
-               }
-
+               startTestAction.setImageDescriptor(PHPUnitImages.DESC_RUN_TEST_SUITE);
+ 
        
                toolBarManager.add(startTestAction);
        }
@@ -275,29 +253,7 @@ public class PHPUnitView extends ViewPart {
                
        }
 
-       // action to start tests:
-       public void startTests() throws IOException {
-
-//             // preparation:
-//             // take the full test suite (could containt other test suites).
-//             // create temp php file that starts that suite and uses socketTestReport 
-//             // as a test result reporter.
-//             // add listener: localhost , port 13579
-//             // start listening at port.
-//
-//             testPool = new TestPool("RUN MONDAY 11:15 PM");
-//             listenForReports();
-//             
-//             try {
-//                     Runtime.getRuntime().exec("php.exe \"C:/Program Files/Apache Group/Apache2/htdocs/phpUnit/suite.php\"");
-//             } catch (Exception e) {
-//                     
-//                     e.printStackTrace();
-//             }
-
-       startTests("C:/Program Files/Apache Group/Apache2/htdocs/phpUnit/suite.php");
 
-       }
 
        public void startTests(String testSuite) throws IOException {
                
@@ -322,7 +278,10 @@ public class PHPUnitView extends ViewPart {
 
                out.write("<?php" + "\n");
                out.write("ob_start();" + "\n");
+               
+               //TODO: use install dir for path to phpunit. include it with plugin.
                out.write("$path = \"C:/Documents and Settings/Ali Echihabi/My Documents/workspace.eclipse2.1/PHPUnit/phpunit\";" + "\n");
+               
                out.write("include_once($path . \"/phpunit_test.php\");" + "\n");
                out.write("include_once $path . \"/socketTestResult.php\";" + "\n");
 
@@ -426,7 +385,7 @@ public class PHPUnitView extends ViewPart {
                        String testCount = args[1];
                        
                        //createNewTestSuite("TestSuiteName: " + testID, testID, new Integer(testCount).intValue());
-                       TestSuite suite = new TestSuite("TestSuiteName: " + testID, testID, new Integer(testCount).intValue());
+                       TestSuite suite = new TestSuite(null, "TestSuiteName: " + testID, testID, new Integer(testCount).intValue());
                        testPool.addTestSuite(suite);
 
                } else if (command.equals("testStarted")) {
@@ -491,4 +450,6 @@ public class PHPUnitView extends ViewPart {
        }
 
 
+
+
 } //end of class