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 9f388dd..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,3 +1,11 @@
+/*************************************************************************
+ * @author Ali Echihabi (ali_echihabi@ieee.org, ali.echihabi@souss.ca)
+ *
+ * Plugin for PHP unit Testing.
+ * www.phpeclipse.de
+ * 
+ *************************************************************************/
+
 package net.sourceforge.phpeclipse.phpunit;
 
 
@@ -6,17 +14,15 @@ 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.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.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;
@@ -24,28 +30,7 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.ui.IActionBars;
 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 {
 
@@ -73,8 +58,11 @@ public class PHPUnitView extends ViewPart {
 	private ResultsInfoComposite resultsInfoComposite;
 	//private SettingsInfoComposite settingsInfoComposite; //TODO: move somewhere else, launcher, wizard or preferences.
 	private FileDialog dialog;
+	private String testSuiteToRun;
+
 
-	private String testSuiteToRun = "";
+ 	private Action selectTestAction;
+	private Action startTestAction;
 
 
 	public PHPUnitView() {
@@ -180,37 +168,28 @@ public class PHPUnitView extends ViewPart {
 	}
 
 	private void setActions() {
+		
 		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() {
+		selectTestAction = new Action() {
 			
 			public void run() {
-				
-				testSuiteToRun = dialog.open();	
+						
+				testSuiteToRun = dialog.open();
+				startTestAction.setEnabled(true);	
 			}
 		};
+		
 		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);
 		
 		
-		Action startTestAction = new Action() {
+		startTestAction = new Action() {
 		
 			public void run() {
 				
@@ -220,26 +199,21 @@ public class PHPUnitView extends ViewPart {
 						return;
 						
 					startTests(testSuiteToRun);
+					//setEnabled(false);
+					
 				} catch (IOException e) {
-					// TODO Auto-generated catch block
+					
 					e.printStackTrace();
 				}
 					
 			}
 			
 		};
+		
 		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.setToolTipText("Start Test Suite. Select a Test Suite first.");
+		startTestAction.setImageDescriptor(PHPUnitImages.DESC_RUN_TEST_SUITE);
+ 		startTestAction.setEnabled(false);
 	
 		toolBarManager.add(startTestAction);
 	}
@@ -275,29 +249,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 +274,12 @@ public class PHPUnitView extends ViewPart {
 
 		out.write("<?php" + "\n");
 		out.write("ob_start();" + "\n");
-		out.write("$path = \"C:/Documents and Settings/Ali Echihabi/My Documents/workspace.eclipse2.1/PHPUnit/phpunit\";" + "\n");
+				
+		String path = PHPUnitPlugin.getDefault().getPreferenceStore().getString(PHPUnitPreferencePage.PHPUNIT_PATH);
+
+		
+		out.write("$path = \"" + path + "\";" + "\n");
+		
 		out.write("include_once($path . \"/phpunit_test.php\");" + "\n");
 		out.write("include_once $path . \"/socketTestResult.php\";" + "\n");
 
@@ -426,7 +383,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 +448,6 @@ public class PHPUnitView extends ViewPart {
 	}
 
 
+
+
 } //end of class