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..7ceff39 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,46 +1,42 @@ +/************************************************************************* + * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca) + * + * Plugin for PHP unit Testing. + * www.phpeclipse.de + * + *************************************************************************/ + 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.preferences.PHPUnitPreferencePage; +import net.sourceforge.phpeclipse.phpunit.reporthandling.*; +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.widgets.Button; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; +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; -/** - * @author Ali Echihabi - * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -/* - * Created on May 22, 2004 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -/** - * @author Ali Echihabi (ali_echihabi@ieee.org) - * - * Plugin for PHP unit Testing. - * www.phpeclipse.de - * - * This the main view showing the progress and reports. - * - */ public class PHPUnitView extends ViewPart { + + + /* * like J Unit * a tree. @@ -50,69 +46,99 @@ 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 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. + private FileDialog dialog; + private String testSuiteToRun; + + + private Action selectTestAction; + private Action startTestAction; 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)); + + dialog = new FileDialog(parent.getShell()); + + 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); - - startButton = new Button(parent, SWT.CENTER); - startButton.setText("Start Tests"); - startButton.addMouseListener(new MouseListener() { - - public void mouseDoubleClick(MouseEvent arg0) { - - } - - public void mouseDown(MouseEvent arg0) { - - startTests(); - - } - - public void mouseUp(MouseEvent arg0) { - - } - - }); // end add action listener. + //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) { +// +// 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. } @@ -122,8 +148,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,32 +164,58 @@ public class PHPUnitView extends ViewPart { // phpPathLabel.setText("php Path:"); // //testSuiteLabel.setLayoutData(new GridData()) // Text phpPathText = new Text(settingsInfoComposite, SWT.NONE); - - } 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); + + selectTestAction = new Action() { + + public void run() { + + testSuiteToRun = dialog.open(); + startTestAction.setEnabled(true); + } + }; + + selectTestAction.setText("Select Test Suite"); + selectTestAction.setToolTipText("Select Test Suite"); + selectTestAction.setImageDescriptor(PHPUnitImages.DESC_SELECT_TEST_SUITE); + + + toolBarManager.add(selectTestAction); + + + startTestAction = new Action() { + + public void run() { + + + try { + if(testSuiteToRun == null || testSuiteToRun == "") + return; + + startTests(testSuiteToRun); + //setEnabled(false); + + } catch (IOException e) { + + e.printStackTrace(); + } + + } + + }; + + startTestAction.setText("Start Test"); + startTestAction.setToolTipText("Start Test Suite. Select a Test Suite first."); + startTestAction.setImageDescriptor(PHPUnitImages.DESC_RUN_TEST_SUITE); + startTestAction.setEnabled(false); + + toolBarManager.add(startTestAction); } @@ -180,67 +232,113 @@ 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 markTestFail(String testID) { + + testPool.getTest(testID).setVerdict(TestCase.FAIL); - } - public void createNewTest(String testName, String testID) { - testPool.addTest(new Test(testName, testID)); - } - public void markTestFail(String testID) { - numFailures++; - testPool.getTest(testID).setVerdict(Test.FAIL); + public void startTests(String testSuite) throws IOException { - } - - public void markTestingStarted(int numTestsToBeRun) { + //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. - this.numTests = numTestsToBeRun; - //reportArea.append("Tests started expecting: " + numTests + " \n"); + //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"; + + //create the file. + File testFile = new File(tempFolder + "/" + tempFileName); + BufferedWriter out = new BufferedWriter(new FileWriter(testFile)); - public void markTestingFinished() { + out.write("addTest(new TestSuite(\"" + testSuiteName + "\"));" + "\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("$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(); + 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(); + } /** @@ -271,53 +369,60 @@ 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("testStarted")) { + } else if (command.equals("testSuiteStarted")) { + + 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); - createNewTest("testName", testID); - markTestStarted(testID); + } else if (command.equals("testStarted")) { + + 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(); + } + + update(); - progressInfoComposite.updateInfo(numTests, numTestsRun, numFailures, numErrors); - resultsInfoComposite.updateInfo(testPool); - } - /** - * - */ - private void markTestFinished() { - - numTestsRun++; - } /** * */ - private void updateResultsInfo() { - // TODO Auto-generated method stub + private void update() { + + //progressInfoComposite.updateInfo(numTests, testPool.getNumTestsRun(), numFailures, numErrors); + progressInfoComposite.updateInfo(testPool); + resultsInfoComposite.updateInfo(testPool); } + /** * @param currentTestID * @param verdict @@ -342,4 +447,7 @@ public class PHPUnitView extends ViewPart { } + + + } //end of class