X-Git-Url: http://git.phpeclipse.com 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 847d620..1f16ca6 100644 --- a/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java +++ b/net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java @@ -1,16 +1,25 @@ package net.sourceforge.phpeclipse.phpunit; + + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; import java.io.IOException; +import net.sourceforge.phpeclipse.phpunit.testpool.TestCase; +import net.sourceforge.phpeclipse.phpunit.testpool.TestPool; +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.FillLayout; +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.Group; import org.eclipse.ui.IActionBars; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -41,6 +50,9 @@ import org.eclipse.ui.part.ViewPart; public class PHPUnitView extends ViewPart { + + + /* * like J Unit * a tree. @@ -50,49 +62,62 @@ public class PHPUnitView extends ViewPart { * hierarchy: package->testsuite1->testcase->test_function */ - private int numTests; // total number of tests - private int numTestsRun; // number of tests run so far - private int numFailures; // number of failures so far - private int numErrors; // number of errors so far - private int numPasses; // number of passes so far (they should add up) + private static PHPUnitView view = null; private XMLReportHandler handler; - - - + private TestPool testPool; private Button startButton; private ProgressInfoComposite progressInfoComposite; private ResultsInfoComposite resultsInfoComposite; - private Group settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences. + private SettingsInfoComposite settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences. public PHPUnitView() { - handler = new XMLReportHandler(); - testPool = new TestPool(); + if(view == null) + view = this; } + + public static PHPUnitView getDefault() { + + + return view; + } public void createPartControl(Composite parent) { - parent.setLayout(new FillLayout(SWT.VERTICAL)); + //parent.setLayout(new FillLayout(SWT.VERTICAL)); + + GridLayout gridLayout = new GridLayout(); + gridLayout.numColumns = 1; + + // set title and layout + parent.setLayout(gridLayout); + //Launch ToolBar: setActions(); - //Build the progress info Composite s + //Build the progress info Composites progressInfoComposite = new ProgressInfoComposite(parent); + progressInfoComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING)); - + + //Build the result info composite resultsInfoComposite = new ResultsInfoComposite(parent); + resultsInfoComposite.setLayoutData(new GridData(GridData.GRAB_VERTICAL | GridData.FILL_BOTH)); //build the settings composite - buildSettingsComposite(parent); + //buildSettingsComposite(parent); + + settingsInfoComposite = new SettingsInfoComposite(parent, SWT.NONE); + startButton = new Button(parent, SWT.CENTER); startButton.setText("Start Tests"); @@ -104,12 +129,20 @@ public class PHPUnitView extends ViewPart { public void mouseDown(MouseEvent arg0) { - startTests(); + } 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. @@ -122,8 +155,8 @@ public class PHPUnitView extends ViewPart { private void buildSettingsComposite(Composite parent) { - settingsInfoComposite = new Group(parent, SWT.NONE); -// settingsInfoComposite.setText("Settings"); + //settingsInfoComposite = new Group(parent, SWT.NONE); + //settingsInfoComposite.setText("Settings"); // settingsInfoComposite.setLayout(new GridLayout(2,false)); // // @@ -138,9 +171,7 @@ public class PHPUnitView extends ViewPart { // phpPathLabel.setText("php Path:"); // //testSuiteLabel.setLayoutData(new GridData()) // Text phpPathText = new Text(settingsInfoComposite, SWT.NONE); - - } private void setActions() { @@ -180,41 +211,41 @@ public class PHPUnitView extends ViewPart { * * @param testID */ - public void markTestPassed(String testID) { + private void markTestPassed(String testID) { // testid, use it in hashmap to retrieve tree item of test and // change icon color, increment pass counter, etc... - testPool.getTest(testID).setVerdict(Test.PASS); + testPool.getTest(testID).setVerdict(TestCase.PASS); } - public void markTestStarted(String testID) { + private void markTestStarted(String testID) { } - public void createNewTest(String testName, String testID) { + private void createNewTest(String testName, String testID) { - testPool.addTest(new Test(testName, testID)); + testPool.addTest(new TestCase(testName, testID)); } - public void markTestFail(String testID) { - numFailures++; - testPool.getTest(testID).setVerdict(Test.FAIL); + private void markTestFail(String testID) { + + testPool.getTest(testID).setVerdict(TestCase.FAIL); } - public void markTestingStarted(int numTestsToBeRun) { + private void markTestingStarted(int numTestsToBeRun) { + - this.numTests = numTestsToBeRun; //reportArea.append("Tests started expecting: " + numTests + " \n"); } - public void markTestingFinished() { + private void markTestingFinished() { //reportArea.append("end all tests \n"); @@ -222,25 +253,107 @@ public class PHPUnitView extends ViewPart { } // action to start tests: - private void startTests() { + 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(); + + //where the plugin's temp files should go + String tempFolder = "C:\\tmp"; + String tempFileName = "temTest.php"; + + //create the file. + File testFile = new File(tempFolder + "/" + tempFileName); + BufferedWriter out = new BufferedWriter(new FileWriter(testFile)); + + out.write("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"); + out.write("" + "\n"); + out.write("" + "\n"); + + out.write("?>" + "\n"); + + out.flush(); + out.close(); listenForReports(); try { - Runtime.getRuntime().exec("php.exe \"C:/Program Files/Apache Group/Apache2/htdocs/phpUnit/suite.php\""); - } catch (IOException e) { - // TODO Auto-generated catch block + Runtime.getRuntime().exec("php.exe " + tempFolder + "/" + tempFileName); + } catch (Exception e) { + e.printStackTrace(); } + + //testFile.delete(); + + } + /** + * + */ + private void reset() { + + handler = new XMLReportHandler(); + testPool = new TestPool("Ali Baba"); + + progressInfoComposite.resetInfo(); + resultsInfoComposite.resetInfo(); + } /** @@ -281,9 +394,14 @@ public class PHPUnitView extends ViewPart { markTestingStarted(new Integer(testCount).intValue()); - }else if (command.equals("testStarted")) { + } else if (command.equals("testSuiteStarted")) { + + createNewTestSuite("TestSuiteName: " + testID, testID, new Integer(testCount).intValue()); + markTestSuiteStarted(testID); + + } else if (command.equals("testStarted")) { - createNewTest("testName", testID); + createNewTest("TestName: " + testID, testID); markTestStarted(testID); } else if (command.equals("testFINISHED")) { @@ -295,10 +413,42 @@ public class PHPUnitView extends ViewPart { markTestingFinished(); } + + update(); + - progressInfoComposite.updateInfo(numTests, numTestsRun, numFailures, numErrors); + + } + + /** + * + */ + private void update() { + + //progressInfoComposite.updateInfo(numTests, testPool.getNumTestsRun(), numFailures, numErrors); + progressInfoComposite.updateInfo(testPool); resultsInfoComposite.updateInfo(testPool); + + } + + /** + * @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); + } /** @@ -306,7 +456,6 @@ public class PHPUnitView extends ViewPart { */ private void markTestFinished() { - numTestsRun++; }