Move tests into test fragment
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.example.calc.test/.classpath b/org.eclipse.example.calc.test/.classpath
new file mode 100644
index 0000000..db269cf
--- /dev/null
+++ b/org.eclipse.example.calc.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="tst"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.example.calc.test/.gitignore b/org.eclipse.example.calc.test/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/org.eclipse.example.calc.test/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.example.calc.test/.project b/org.eclipse.example.calc.test/.project
new file mode 100644
index 0000000..a3f0ba9
--- /dev/null
+++ b/org.eclipse.example.calc.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.example.calc.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/org.eclipse.example.calc.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.example.calc.test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..278ec2b
--- /dev/null
+++ b/org.eclipse.example.calc.test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Wed Mar 16 23:05:50 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.example.calc.test/META-INF/MANIFEST.MF b/org.eclipse.example.calc.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3e05071
--- /dev/null
+++ b/org.eclipse.example.calc.test/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Calculator Test
+Bundle-SymbolicName: org.eclipse.example.calc.test
+Bundle-Version: 0.1.0.qualifier
+Fragment-Host: org.eclipse.example.calc;bundle-version="[0.1.0,0.2.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.6
+Require-Bundle: org.junit4;bundle-version="[4.3.0,5.0.0)",
+ org.hamcrest;bundle-version="[1.1.0,2.0.0)"
+Import-Package: org.eclipse.example.calc.internal;version="[0.1.0,0.2.0)"
+
diff --git a/org.eclipse.example.calc.test/build.properties b/org.eclipse.example.calc.test/build.properties
new file mode 100644
index 0000000..54c9cd2
--- /dev/null
+++ b/org.eclipse.example.calc.test/build.properties
@@ -0,0 +1,4 @@
+source.. = tst/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/org.eclipse.example.calc/org.eclipse.example.calc--All-Tests.launch b/org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch
similarity index 87%
rename from org.eclipse.example.calc/org.eclipse.example.calc--All-Tests.launch
rename to org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch
index 0723143..b2e41f4 100644
--- a/org.eclipse.example.calc/org.eclipse.example.calc--All-Tests.launch
+++ b/org.eclipse.example.calc.test/org.eclipse.example.calc--All-Tests.launch
@@ -2,16 +2,16 @@
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<stringAttribute key="bad_container_name" value="org.eclipse.example.calc--All-Tests"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.example.calc/tst"/>
+<listEntry value="/org.eclipse.example.calc.test/tst"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="2"/>
</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.example.calc/tst"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.example.calc.test/tst"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.example.calc"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.example.calc.test"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
</launchConfiguration>
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/OperationsTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/OperationsTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/OperationsTest.java
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/CalculatorTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java
similarity index 98%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/CalculatorTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java
index 3741c1c..031d49c 100644
--- a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/CalculatorTest.java
+++ b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/CalculatorTest.java
@@ -80,13 +80,11 @@
private String text = "0";
- @Override
public void setDisplayText(String text) {
this.text = text;
}
- @Override
public String getDisplayText() {
return text;
}
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/AbstractOperationTest.java
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/EqualsTest.java
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/MinusTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/MinusTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/MinusTest.java
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/PlusTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/PlusTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/PlusTest.java
diff --git a/org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/SquareTest.java b/org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java
similarity index 100%
rename from org.eclipse.example.calc/tst/org/eclipse/example/calc/internal/operations/SquareTest.java
rename to org.eclipse.example.calc.test/tst/org/eclipse/example/calc/internal/operations/SquareTest.java
diff --git a/org.eclipse.example.calc/.classpath b/org.eclipse.example.calc/.classpath
index b646dd2..121e527 100644
--- a/org.eclipse.example.calc/.classpath
+++ b/org.eclipse.example.calc/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="tst"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.example.calc/META-INF/MANIFEST.MF b/org.eclipse.example.calc/META-INF/MANIFEST.MF
index d89f64e..31d5118 100644
--- a/org.eclipse.example.calc/META-INF/MANIFEST.MF
+++ b/org.eclipse.example.calc/META-INF/MANIFEST.MF
@@ -5,10 +5,9 @@
Bundle-Version: 0.1.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.6
-Require-Bundle: org.junit4;bundle-version="[4.3.0,5.0.0)",
- org.hamcrest;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.swt;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.swt;bundle-version="[3.5.0,4.0.0)"
Export-Package: org.eclipse.example.calc;version="0.1.0",
+ org.eclipse.example.calc.internal;version="0.1.0";x-internal:=true,
org.eclipse.example.calc.internal.operations;version="0.1.0";x-internal:=true,
org.eclipse.example.calc.internal.ui.swing;version="0.1.0";x-internal:=true,
org.eclipse.example.calc.internal.ui.swt;version="0.1.0";x-internal:=true
diff --git a/org.eclipse.example.calc/build.properties b/org.eclipse.example.calc/build.properties
index 1c56dd0..b107977 100644
--- a/org.eclipse.example.calc/build.properties
+++ b/org.eclipse.example.calc/build.properties
@@ -1,4 +1,3 @@
-source.. = src/,\
- tst/
+source.. = src/
bin.includes = META-INF/,\
.
