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
index 1f16ca6..e304352 100644 (file)
@@ -13,16 +13,11 @@ import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
 /**
@@ -68,18 +63,22 @@ public class PHPUnitView extends ViewPart {
        
        private TestPool testPool;
 
-       private Button startButton;
+       //private Button startButton;
 
        private ProgressInfoComposite progressInfoComposite;
        private ResultsInfoComposite resultsInfoComposite;
-       private SettingsInfoComposite settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences.
-       
+       //private SettingsInfoComposite settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences.
+       private FileDialog dialog;
+
+       private String testSuiteToRun = "";
 
 
        public PHPUnitView() {
                
                if(view == null)
                        view = this;
+                       
+                       
 
        }
        
@@ -93,6 +92,8 @@ public class PHPUnitView extends ViewPart {
 
                //parent.setLayout(new FillLayout(SWT.VERTICAL));
 
+               dialog = new FileDialog(parent.getShell());
+
                GridLayout gridLayout = new GridLayout();
                gridLayout.numColumns = 1;
                
@@ -116,36 +117,36 @@ public class PHPUnitView extends ViewPart {
                //build the settings composite
                //buildSettingsComposite(parent);
                
-               settingsInfoComposite = new SettingsInfoComposite(parent, SWT.NONE);
-
-
-               startButton = new Button(parent, SWT.CENTER);
-               startButton.setText("Start Tests");
-               startButton.addMouseListener(new MouseListener() {
-
-                       public void mouseDoubleClick(MouseEvent arg0) {
-
-                       }
-
-                       public void mouseDown(MouseEvent arg0) {
-
+               //settingsInfoComposite = new SettingsInfoComposite(parent, SWT.NONE);
 
 
-                       }
-
-                       public void mouseUp(MouseEvent arg0) {
-
-                               try {
-                                       String testFile = settingsInfoComposite.getTestSuite();
-                                       startTests(testFile);
-                               } catch (IOException e) {
-                                       // TODO Auto-generated catch block
-                                       e.printStackTrace();
-                               }
-
-                       }
-
-               }); // end add action listener.
+//             startButton = new Button(parent, SWT.CENTER);
+//             startButton.setText("Start Tests");
+//             startButton.addMouseListener(new MouseListener() {
+//
+//                     public void mouseDoubleClick(MouseEvent arg0) {
+//
+//                     }
+//
+//                     public void mouseDown(MouseEvent arg0) {
+//
+//                             try {
+//                                     String testFile = settingsInfoComposite.getTestSuite();
+//                                     startTests(testFile);
+//                             } catch (IOException e) {
+//                                     // TODO Auto-generated catch block
+//                                     e.printStackTrace();
+//                             }
+//
+//
+//                     }
+//
+//                     public void mouseUp(MouseEvent arg0) {
+//
+//
+//                     }
+//
+//             }); // end add action listener.
 
        }
 
@@ -177,24 +178,48 @@ public class PHPUnitView extends ViewPart {
        private void setActions() {
                final IActionBars actionBars = getViewSite().getActionBars();
                IToolBarManager toolBarManager = actionBars.getToolBarManager();
-               Action action1 = new Action() {};
-               action1.setText("Action 1");
-               action1.setToolTipText("Start the testing");
-               //final URL installUrl = PaintPlugin.getDefault().getDescriptor().getInstallURL();
-               //final URL imageUrl = new URL(installUrl, PaintPlugin.getResourceString(id + ".image"));
-//             URL imageUrl = null;
-//             try {
-//                     imageUrl =
-//                             new URL("C:\\sample.gif");
-//             } catch (MalformedURLException e) {
-//                     // TODO Auto-generated catch block
-//                     e.printStackTrace();
-//             }
-//             action1.setImageDescriptor(ImageDescriptor.createFromURL(imageUrl));
-//             
-               action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-                       getImageDescriptor(ISharedImages.IMG_OBJS_TASK_TSK));
-               toolBarManager.add(action1);
+
+               Action selectTestAction = new Action() {
+                       
+                       public void run() {
+                               
+                               testSuiteToRun = dialog.open(); 
+                       }
+               };
+               
+               selectTestAction.setText("Select Test Suite");
+               selectTestAction.setToolTipText("Select Test Suite");           
+               selectTestAction.setImageDescriptor(PHPUnitImages.DESC_SELECT_TEST_SUITE);
+               
+                               
+               toolBarManager.add(selectTestAction);
+               
+               
+               Action startTestAction = new Action() {
+               
+                       public void run() {
+                               
+                               
+                               try {
+                                       if(testSuiteToRun == null || testSuiteToRun == "")
+                                               return;
+                                               
+                                       startTests(testSuiteToRun);
+                               } catch (IOException e) {
+                                       // TODO Auto-generated catch block
+                                       e.printStackTrace();
+                               }
+                                       
+                       }
+                       
+               };
+               
+               startTestAction.setText("Start Test");
+               startTestAction.setToolTipText("Start Test Suite");
+               startTestAction.setImageDescriptor(PHPUnitImages.DESC_RUN_TEST_SUITE);
+       
+               toolBarManager.add(startTestAction);
        }
 
 
@@ -221,16 +246,6 @@ public class PHPUnitView extends ViewPart {
 
        }
 
-       private void markTestStarted(String testID) {
-
-               
-
-       }
-
-       private void createNewTest(String testName, String testID) {
-
-               testPool.addTest(new TestCase(testName, testID));
-       }
 
        private void markTestFail(String testID) {
                
@@ -238,53 +253,21 @@ public class PHPUnitView extends ViewPart {
                
        }
 
-       private void markTestingStarted(int numTestsToBeRun) {
-               
-               
-               //reportArea.append("Tests started expecting: " + numTests + " \n");
-               
-       }
 
-       private void markTestingFinished() {
-
-               
-               //reportArea.append("end all tests \n");
-
-       }
-
-       // 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 {
                
                //testSuite: the name of the file containing the suite we want to run.
                // we will put that test suite inside a contained that uses our SocketResult.
-
-
+               
                //reset from previous run
                reset();
                
+               
+               testSuite = testSuite.replaceAll("\\\\", "/");
+               
+               System.out.println("new: " +  testSuite);
+               
                //where the plugin's temp files should go
                String tempFolder = "C:\\tmp"; 
                String tempFileName = "temTest.php";
@@ -294,15 +277,19 @@ public class PHPUnitView extends ViewPart {
                BufferedWriter out = new BufferedWriter(new FileWriter(testFile));
 
                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");
 
                //include the test suite that we want to run.
-               String testSuiteName = "ManyFailingTests2";
-               String testSuitePath = "C:/eclipse/eclipse/runtime-workspace/PHPProject/testSuite.php";
-               
-               out.write("include_once(\"" + testSuitePath + "\");" + "\n");
+               String testSuiteName = "";
+               testSuiteName = testSuite.substring(testSuite.lastIndexOf('/') + 1, testSuite.lastIndexOf('.'));
+
+               out.write("include_once(\"" + testSuite + "\");" + "\n");
                
 
                out.write("" + "\n");
@@ -311,13 +298,7 @@ public class PHPUnitView extends ViewPart {
                out.write("$suite = new TestSuite();" + "\n");
                out.write("$suite->addTest(new TestSuite(\"" + testSuiteName + "\"));" + "\n");
                
-               
-               
-               //out.write("$suite->addTest(new TestSuite(\"MoreTesterTests\"));" + "\n");
        
-               //out.write("$suite->addTest(new TestSuite(\"ManyFailingTests\"));" + "\n");
-               //out.write("$suite->addTest(new TestSuite(\"AssertEqualsTests\"));" + "\n");           
-                       
                out.write("$result = new SocketTestResult();" + "\n");
                out.write("$suite->run($result);" + "\n");
                out.write("$result->report();   " + "\n");
@@ -325,6 +306,12 @@ public class PHPUnitView extends ViewPart {
                out.write("" + "\n");
                out.write("" + "\n");
                
+               out.write("$output = ob_get_contents();" + "\n");
+               out.write("$fileHandle = fopen('c:/tmp/phpOut.txt');" + "\n");
+               out.write("fclose($fileHandle);" + "\n");
+               
+               
+               out.write("ob_end();" + "\n");
                out.write("?>" + "\n");
                
                out.flush();
@@ -384,33 +371,39 @@ public class PHPUnitView extends ViewPart {
         * @param testID
         */
        public void handleCommand(
-               String command,
-               String testCount,
-               String testID) {
-
+               String command, String[] args) {
+       
 
                if (command.equals("startAll")) {
                
-                        markTestingStarted(new Integer(testCount).intValue());
+                        //markTestingStarted(new Integer(testCount).intValue());
                         
                        
                } else if (command.equals("testSuiteStarted")) {
 
-                       createNewTestSuite("TestSuiteName: " + testID, testID, new Integer(testCount).intValue());
-                       markTestSuiteStarted(testID);
+                       String testID = args[0];
+                       String testCount = args[1];
+                       
+                       //createNewTestSuite("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")) {
 
-                       createNewTest("TestName: " + testID, testID);
-                       markTestStarted(testID);
+                       String testID = args[0];
+                       String testCount = args[1];
+                       String testName = args[2];
+                       String parentTestSuiteName = args[3];
+                       
+                       testPool.addTest(new TestCase(testID, testName, parentTestSuiteName));                  
 
                } else if (command.equals("testFINISHED")) {
 
-                       markTestFinished();
+                       
                        
                } else if (command.equals("endAll")) {
 
-                       markTestingFinished();
+                       
                }
 
                
@@ -431,41 +424,6 @@ public class PHPUnitView extends ViewPart {
                
        }
 
-       /**
-        * @param testID
-        */
-       private void markTestSuiteStarted(String testID) {
-               // TODO Auto-generated method stub
-               
-       }
-
-       /**
-        * @param string
-        * @param testID
-        * @param testCount
-        */
-       private void createNewTestSuite(String name, String testID, int testCount) {
-               
-               TestSuite suite = new TestSuite(name, testID, testCount);
-               testPool.addTestSuite(suite);
-               
-       }
-
-       /**
-        * 
-        */
-       private void markTestFinished() {
-                       
-               
-       }
-
-       /**
-        * 
-        */
-       private void updateResultsInfo() {
-               // TODO Auto-generated method stub
-               
-       }
 
        /**
         * @param currentTestID
@@ -491,4 +449,7 @@ public class PHPUnitView extends ViewPart {
 
        }
 
+
+
+
 } //end of class