X-Git-Url: http://secure.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 6510e34..847d620 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,20 +1,19 @@
package net.sourceforge.phpeclipse.phpunit;
+import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.ServerSocket;
-import java.net.Socket;
-
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
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.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
/**
@@ -40,7 +39,6 @@ import org.eclipse.ui.part.ViewPart;
*
*/
-
public class PHPUnitView extends ViewPart {
/*
@@ -49,80 +47,132 @@ public class PHPUnitView extends ViewPart {
* The first level nodes are the test suites.
* children are nested test suites.
* leafs: test functions.
+ * 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)
- Label labelRuns, labelRunsVal; // Runs: 12
- Label labelErrors, labelErrorsVal;
- Label labelFailures, labelFailuresVal;
+ 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.
- Text reportArea; // TODO: replace with Tree display like JUnit
- Button startButton;
public PHPUnitView() {
+ handler = new XMLReportHandler();
+ testPool = new TestPool();
+
}
-
+
public void createPartControl(Composite parent) {
+
+ parent.setLayout(new FillLayout(SWT.VERTICAL));
+
+ //Launch ToolBar:
+ setActions();
+
+ //Build the progress info Composite s
+ progressInfoComposite = new ProgressInfoComposite(parent);
- //viewer = new TreeViewer(parent);
- labelRuns = new Label(parent, SWT.WRAP);
- labelRuns.setText("Runs: ");
- labelRunsVal = new Label(parent, SWT.WRAP);
- labelRunsVal.setText("0 / 0");
-
- labelFailures = new Label(parent, SWT.WRAP);
- labelFailures.setText("Failures: ");
- labelFailuresVal = new Label(parent, SWT.WRAP);
- labelFailuresVal.setText("0");
-
- labelErrors = new Label(parent, SWT.WRAP);
- labelErrors.setText("Errors: ");
- labelErrorsVal = new Label(parent, SWT.WRAP);
- labelErrorsVal.setText("0");
- reportArea = new Text(parent, SWT.MULTI | SWT.BORDER |
- SWT.WRAP | SWT.V_SCROLL | SWT.READ_ONLY);
+ //Build the result info composite
+ resultsInfoComposite = new ResultsInfoComposite(parent);
+ //build the settings composite
+ buildSettingsComposite(parent);
+
startButton = new Button(parent, SWT.CENTER);
startButton.setText("Start Tests");
- startButton.addMouseListener( new MouseListener() {
+ startButton.addMouseListener(new MouseListener() {
public void mouseDoubleClick(MouseEvent arg0) {
- // TODO Auto-generated method stub
-
+
}
public void mouseDown(MouseEvent arg0) {
- // TODO Auto-generated method stub
+
startTests();
+
}
public void mouseUp(MouseEvent arg0) {
- // TODO Auto-generated method stub
-
+
}
+ }); // end add action listener.
-
-
- }); // end add action listener.
+ }
+
+ /**
+ * @param parent
+ */
+ private void buildSettingsComposite(Composite parent) {
+
+
+ settingsInfoComposite = new Group(parent, SWT.NONE);
+// settingsInfoComposite.setText("Settings");
+// settingsInfoComposite.setLayout(new GridLayout(2,false));
+//
+//
+// //the test suite to launch
+// Label testSuiteLabel = new Label(settingsInfoComposite, SWT.NONE);
+// testSuiteLabel.setText("Test suite to run:");
+// //testSuiteLabel.setLayoutData(new GridData())
+// Text testSuiteText = new Text(settingsInfoComposite, SWT.NONE);
+//
+// //the path to php
+// Label phpPathLabel = new Label(settingsInfoComposite, SWT.NONE);
+// phpPathLabel.setText("php Path:");
+// //testSuiteLabel.setLayoutData(new GridData())
+// Text phpPathText = new Text(settingsInfoComposite, SWT.NONE);
- // TODO layout!
+
+
+ }
+
+ 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);
}
+
+
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#setFocus()
*/
public void setFocus() {
- //markTestPass("hello");
+
}
/**
@@ -130,86 +180,166 @@ public class PHPUnitView extends ViewPart {
*
* @param testID
*/
- private void markTestPass(String testID) {
-
+ public 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);
+
+ }
+
+ public void markTestStarted(String testID) {
+
- //for now:
- reportArea.append("test passed");
+
+ }
+
+ 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 markTestingStarted(int numTestsToBeRun) {
+
+ this.numTests = numTestsToBeRun;
+ //reportArea.append("Tests started expecting: " + numTests + " \n");
+
+ }
+
+ public void markTestingFinished() {
+
+
+ //reportArea.append("end all tests \n");
+
}
-
-
-
// action to start tests:
private void startTests() {
-
+
// 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.
+
- reportArea.append("Tests started \n");
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
+ e.printStackTrace();
+ }
+
}
-
+
+ /**
+ *
+ */
private void listenForReports() {
+
+ ConnectionListener conListener = new ConnectionListener();
+ conListener.start(this);
+
+ } //end of method
+
+ /**
+ * handle this report: test passed, faile, end of all.
+ * @param report
+ */
+ public void handleReport(String report) {
+
+ //delegate to the XML report handler.
+ handler.handle(report, this);
+
+ }
+
+
+ /**
+ * @param command
+ * @param testCount
+ * @param testID
+ */
+ public void handleCommand(
+ String command,
+ String testCount,
+ String testID) {
+
+
+ if (command.equals("startAll")) {
- ServerSocket sSocket = null;
- Socket serviceSocket = null;
-
- try {
-
- reportArea.append("listening at port 12345");
-
- sSocket = new ServerSocket(12345);
-
- // accept connection from test reporter.
- serviceSocket = sSocket.accept();
-
-
- InputStreamReader reader = new InputStreamReader(serviceSocket.getInputStream());
- BufferedReader in = new BufferedReader(reader);
- String report = null;
-
- // keep listening until the
- while ( (report = in.readLine()) != null && (report != "end_all_tests") ) {
-
- handleReport(report);
- }
-
- reportArea.append("Finished!");
-
- sSocket.close();
- serviceSocket.close();
+ markTestingStarted(new Integer(testCount).intValue());
+
- } catch (Exception e) {
+ }else if (command.equals("testStarted")) {
+
+ createNewTest("testName", testID);
+ markTestStarted(testID);
+
+ } else if (command.equals("testFINISHED")) {
+
+ markTestFinished();
- e.printStackTrace();
+ } else if (command.equals("endAll")) {
+
+ markTestingFinished();
+ }
+
+
+ progressInfoComposite.updateInfo(numTests, numTestsRun, numFailures, numErrors);
+ resultsInfoComposite.updateInfo(testPool);
+
+ }
+
+ /**
+ *
+ */
+ private void markTestFinished() {
- }
-
-
-
+ numTestsRun++;
}
-
+
/**
- * handle this report: test passed, faile, end of all.
- * @param report
+ *
*/
- private void handleReport(String report) {
-
- reportArea.append("msg: " + report + "\n");
+ private void updateResultsInfo() {
+ // TODO Auto-generated method stub
}
-
-}
+ /**
+ * @param currentTestID
+ * @param verdict
+ */
+ public void setTestVerdict(String currentTestID, String verdict) {
+
+ if (verdict.equals("passed"))
+ markTestPassed(currentTestID);
+ else
+ markTestFail(currentTestID);
+
+ }
+
+ /**
+ * @param currentTestID
+ * @param exception
+ */
+ public void addTestException(String currentTestID, String exception) {
+
+ //TODO: decide how to show exceptions. don't show them for now.
+ //reportArea.append(" test " + currentTestID + " exception: " + exception + "\n");
+
+ }
+
+} //end of class