From: pombredanne <pombredanne>
Date: Fri, 27 Oct 2006 01:51:36 +0000 (+0000)
Subject: Moved the code in the "tests" plugin (plural) to the "test" fragment (singular).... 
X-Git-Url: http://git.phpeclipse.com?hp=1a72eadff33a94351b087a693c0021ea26ffadd3

Moved the code in the "tests" plugin (plural) to the "test" fragment (singular). The tests plugin will be used for shared testing utilities. Each plugin will have its own ".test" fragment for junit tests going forward.
---

diff --git a/net.sourceforge.phpeclipse.test/.classpath b/net.sourceforge.phpeclipse.test/.classpath
new file mode 100644
index 0000000..751c8f2
--- /dev/null
+++ b/net.sourceforge.phpeclipse.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/net.sourceforge.phpeclipse.test/.project b/net.sourceforge.phpeclipse.test/.project
new file mode 100644
index 0000000..d154713
--- /dev/null
+++ b/net.sourceforge.phpeclipse.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.sourceforge.phpeclipse.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/net.sourceforge.phpeclipse.test/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..483bf3a
--- /dev/null
+++ b/net.sourceforge.phpeclipse.test/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test Fragment
+Bundle-SymbolicName: net.sourceforge.phpeclipse.test
+Bundle-Version: 1.0.0
+Bundle-Vendor: PHPEclipse team
+Fragment-Host: net.sourceforge.phpeclipse;bundle-version="1.0.0"
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime.compatibility,
+ org.eclipse.ui,
+ org.junit,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/net.sourceforge.phpeclipse.test/build.properties b/net.sourceforge.phpeclipse.test/build.properties
new file mode 100644
index 0000000..34d2e4d
--- /dev/null
+++ b/net.sourceforge.phpeclipse.test/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/net.sourceforge.phpeclipse.tests/plugin.xml b/net.sourceforge.phpeclipse.test/frament.xml
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/plugin.xml
rename to net.sourceforge.phpeclipse.test/frament.xml
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
similarity index 91%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
index 19da326..3c77d24 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
+++ b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/core/tests/util/AbstractCompilerTest.java
@@ -24,7 +24,6 @@ import junit.framework.TestSuite;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
-import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.batch.CompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
@@ -34,13 +33,8 @@ import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblem;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 
-// import net.sourceforge.phpdt.core.tests.junit.extension.TestCase;
-// import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
-
 public class AbstractCompilerTest extends TestCase {
 
-	private static int possibleComplianceLevels = -1;
-
 	protected String complianceLevel;
 
 	public void checkParsePHP(char[] source, String expectedSyntaxErrorDiagnosis) {
@@ -55,15 +49,7 @@ public class AbstractCompilerTest extends TestCase {
 		CompilationResult compilationResult = new CompilationResult(sourceUnit,
 				0, 0, 0);
 
-		CompilationUnitDeclaration computedUnit = parser.dietParse(sourceUnit,
-				compilationResult, true);
-		// if (computedUnit.types != null) {
-		// for (int i = computedUnit.types.size(); --i >= 0;){
-		// ((TypeDeclaration)computedUnit.types.get(i)).parseMethod(parser,
-		// computedUnit);
-		// }
-		// }
-
+		parser.dietParse(sourceUnit, compilationResult, true);
 		StringBuffer buffer = new StringBuffer(100);
 		if (compilationResult.hasProblems() || compilationResult.hasTasks()) {
 			IProblem[] problems = compilationResult.getAllProblems();
@@ -119,14 +105,7 @@ public class AbstractCompilerTest extends TestCase {
 		CompilationResult compilationResult = new CompilationResult(sourceUnit,
 				0, 0, 0);
 
-		CompilationUnitDeclaration computedUnit = parser.dietParse(sourceUnit,
-				compilationResult, false);
-		// if (computedUnit.types != null) {
-		// for (int i = computedUnit.types.size(); --i >= 0;){
-		// ((TypeDeclaration)computedUnit.types.get(i)).parseMethod(parser,
-		// computedUnit);
-		// }
-		// }
+		parser.dietParse(sourceUnit, compilationResult, false);
 
 		StringBuffer buffer = new StringBuffer(100);
 		if (compilationResult.hasProblems() || compilationResult.hasTasks()) {
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/Util.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/core/tests/util/Util.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpdt/core/tests/util/Util.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/core/tests/util/Util.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/internal/formatter/CodeFormatterTest.java
similarity index 97%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/internal/formatter/CodeFormatterTest.java
index a6915be..d3befec 100644
--- a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/PHPFormatterTest.java
+++ b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpdt/internal/formatter/CodeFormatterTest.java
@@ -2,7 +2,7 @@
  * Created on 28.04.2003
  *
  */
-package net.sourceforge.phpeclipse.phpeditor.php.test;
+package net.sourceforge.phpdt.internal.formatter;
 
 import java.util.Map;
 
@@ -12,6 +12,7 @@ import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
 import net.sourceforge.phpdt.internal.corext.util.Strings;
 import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
 import net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage;
+import net.sourceforge.phpeclipse.phpeditor.php.test.DummyDocument;
 
 import org.eclipse.jface.text.IDocument;
 
@@ -21,7 +22,7 @@ import org.eclipse.jface.text.IDocument;
  * @author Stefan Langer
  * @version $Revision: 1.7 $
  */
-public class PHPFormatterTest extends TestCase {
+public class CodeFormatterTest extends TestCase {
 	private CodeFormatter fFormatter;
 
 	private IDocument fDocument;
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/example/outline/Import2Console.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/example/outline/Import2Console.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/example/outline/Import2Console.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/example/outline/Import2Console.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/example/outline/Type2Console.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/example/outline/Type2Console.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/example/outline/Type2Console.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/example/outline/Type2Console.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/DualParseSyntaxErrorTest.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DummyDocument.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/DummyDocument.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/DummyDocument.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/DummyDocument.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/IdentifierIndexManagerTest.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/IdentifierIndexManagerTest.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/phpeditor/php/test/IdentifierIndexManagerTest.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/phpeditor/php/test/IdentifierIndexManagerTest.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/OverlibTestCase.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/OverlibTestCase.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/OverlibTestCase.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/OverlibTestCase.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPManualTestCase.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestCase.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestSuite.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestSuite.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestSuite.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/PHPParserTestSuite.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/ShortTagTestCase.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/ShortTagTestCase.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/ShortTagTestCase.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/ShortTagTestCase.java
diff --git a/net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/SmartyCompilerTestCase.java b/net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/SmartyCompilerTestCase.java
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/src/net/sourceforge/phpeclipse/tests/parser/SmartyCompilerTestCase.java
rename to net.sourceforge.phpeclipse.test/src/net/sourceforge/phpeclipse/tests/parser/SmartyCompilerTestCase.java
diff --git a/net.sourceforge.phpeclipse.tests/test.php b/net.sourceforge.phpeclipse.test/test.php
similarity index 100%
rename from net.sourceforge.phpeclipse.tests/test.php
rename to net.sourceforge.phpeclipse.test/test.php
diff --git a/net.sourceforge.phpeclipse.tests/.classpath b/net.sourceforge.phpeclipse.tests/.classpath
index 065ac06..ce73933 100644
--- a/net.sourceforge.phpeclipse.tests/.classpath
+++ b/net.sourceforge.phpeclipse.tests/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/net.sourceforge.phpeclipse.tests/.project b/net.sourceforge.phpeclipse.tests/.project
index 86b9694..922a772 100644
--- a/net.sourceforge.phpeclipse.tests/.project
+++ b/net.sourceforge.phpeclipse.tests/.project
@@ -3,7 +3,6 @@
 	<name>net.sourceforge.phpeclipse.tests</name>
 	<comment></comment>
 	<projects>
-		<project>net.sourceforge.phpeclipse</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/net.sourceforge.phpeclipse.tests/.settings/org.eclipse.jdt.core.prefs b/net.sourceforge.phpeclipse.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..607728d
--- /dev/null
+++ b/net.sourceforge.phpeclipse.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Thu Oct 26 18:35:19 PDT 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/net.sourceforge.phpeclipse.tests/.template b/net.sourceforge.phpeclipse.tests/.template
deleted file mode 100644
index f3bcd41..0000000
--- a/net.sourceforge.phpeclipse.tests/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form>
-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
-</form>
diff --git a/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
index 5decd51..7604a11 100644
--- a/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Core Tests
-Bundle-SymbolicName: net.sourceforge.phpeclipse.tests; singleton:=true
+Bundle-Name: Common Tests Utilities
+Bundle-SymbolicName: net.sourceforge.phpeclipse.tests
 Bundle-Version: 1.1.0
 Bundle-ClassPath: coretests.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: PHPEclipse project team
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime.compatibility,
- org.eclipse.ui,
- org.junit,
- net.sourceforge.phpeclipse,
- org.eclipse.jface.text,
- org.eclipse.core.resources
+Require-Bundle: org.junit
 Eclipse-LazyStart: true
-Export-Package: net.sourceforge.phpdt.core.tests.util,
- net.sourceforge.phpeclipse.example.outline,
- net.sourceforge.phpeclipse.phpeditor.php.test,
- net.sourceforge.phpeclipse.tests.parser
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/net.sourceforge.phpeclipse.tests/build.properties b/net.sourceforge.phpeclipse.tests/build.properties
index 6297c21..76de62a 100644
--- a/net.sourceforge.phpeclipse.tests/build.properties
+++ b/net.sourceforge.phpeclipse.tests/build.properties
@@ -2,14 +2,9 @@ jars.compile.order = coretests.jar
 source.coretests.jar = src/
 output.coretests.jar = bin/
 bin.includes = coretests.jar,\
-               META-INF/,\
-               plugin.xml,\
-               test.php
-src.includes = test.php,\
-               src/,\
-               plugin.xml,\
+               META-INF/
+src.includes = src/,\
                build.properties,\
                META-INF/,\
-               .template,\
                .project,\
                .classpath