Use classical Maven structure for unit tests (#508)

jbosstools · May 4, 2016 · 884c61d · 884c61d
1 parent d0dc706
commit 884c61d
Show file tree

Hide file tree

Showing 44 changed files with 22 additions and 28 deletions.
diff --git a/core/tests/org.fusesource.ide.camel.model.service.core.tests/.classpath b/core/tests/org.fusesource.ide.camel.model.service.core.tests/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test"/>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/tests/org.fusesource.ide.camel.model.service.core.tests/build.properties b/core/tests/org.fusesource.ide.camel.model.service.core.tests/build.properties
@@ -1,4 +1,4 @@
-source.. = src-test/
+source.. = src/test/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/...re/util/CamelFileTemplateCreatorTest.java → ...re/util/CamelFileTemplateCreatorTest.java b/...re/util/CamelFileTemplateCreatorTest.java → ...re/util/CamelFileTemplateCreatorTest.java
diff --git a/...ervice/core/util/PropertiesUtilsTest.java → ...ervice/core/util/PropertiesUtilsTest.java b/...ervice/core/util/PropertiesUtilsTest.java → ...ervice/core/util/PropertiesUtilsTest.java
diff --git a/core/tests/org.fusesource.ide.camel.validation.tests.integration/META-INF/MANIFEST.MF b/core/tests/org.fusesource.ide.camel.validation.tests.integration/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: org.assertj.core;bundle-version="2.1.0",
  org.junit;bundle-version="4.12.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
  org.eclipse.core.resources,
+ org.eclipse.core.databinding;bundle-version="1.5.0",
  org.fusesource.ide.camel.validation,
  org.fusesource.ide.camel.model.service.core,
  org.eclipse.wst.validation,

diff --git a/...validation/model/NumberValidatorTest.java → ...l/validation/model/NumberValidatorIT.java b/...validation/model/NumberValidatorTest.java → ...l/validation/model/NumberValidatorIT.java
@@ -14,7 +14,7 @@
 import org.fusesource.ide.camel.model.service.core.catalog.Parameter;
 import org.junit.Test;
 
-public class NumberValidatorTest {
+public class NumberValidatorIT {
 
 	@Test
 	public void testValidateOK() throws Exception {

diff --git a/core/tests/org.fusesource.ide.camel.validation.tests/.classpath b/core/tests/org.fusesource.ide.camel.validation.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/tests/org.fusesource.ide.camel.validation.tests/build.properties b/core/tests/org.fusesource.ide.camel.validation.tests/build.properties
@@ -1,4 +1,4 @@
-source.. = src-test/
+source.. = src/test/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/...dationMarkerOnRemoveEventHandlerTest.java → ...dationMarkerOnRemoveEventHandlerTest.java b/...dationMarkerOnRemoveEventHandlerTest.java → ...dationMarkerOnRemoveEventHandlerTest.java
diff --git a/.../model/RequiredPropertyValidatorTest.java → .../model/RequiredPropertyValidatorTest.java b/.../model/RequiredPropertyValidatorTest.java → .../model/RequiredPropertyValidatorTest.java
diff --git a/editor/tests/org.fusesource.ide.camel.editor.tests/.classpath b/editor/tests/org.fusesource.ide.camel.editor.tests/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.../editor/GoToMarkerForCamelEditorTest.java → .../editor/GoToMarkerForCamelEditorTest.java b/.../editor/GoToMarkerForCamelEditorTest.java → .../editor/GoToMarkerForCamelEditorTest.java
diff --git a/...nt/wizard/ComponentLabelProviderTest.java → ...nt/wizard/ComponentLabelProviderTest.java b/...nt/wizard/ComponentLabelProviderTest.java → ...nt/wizard/ComponentLabelProviderTest.java
diff --git a/...omponent/wizard/ComponentManagerTest.java → ...omponent/wizard/ComponentManagerTest.java b/...omponent/wizard/ComponentManagerTest.java → ...omponent/wizard/ComponentManagerTest.java
diff --git a/...ComponentNameAndTagPatternFilterTest.java → ...ComponentNameAndTagPatternFilterTest.java b/...ComponentNameAndTagPatternFilterTest.java → ...ComponentNameAndTagPatternFilterTest.java
diff --git a/...ration/GlobalConfigLabelProviderTest.java → ...ration/GlobalConfigLabelProviderTest.java b/...ration/GlobalConfigLabelProviderTest.java → ...ration/GlobalConfigLabelProviderTest.java
diff --git a/...ovider/GlobalEndpointContributorTest.java → ...ovider/GlobalEndpointContributorTest.java b/...ovider/GlobalEndpointContributorTest.java → ...ovider/GlobalEndpointContributorTest.java
diff --git a/...ditor/properties/CamelTypeMapperTest.java → ...ditor/properties/CamelTypeMapperTest.java b/...ditor/properties/CamelTypeMapperTest.java → ...ditor/properties/CamelTypeMapperTest.java
diff --git a/...ties/ParameterPriorityComparatorTest.java → ...ties/ParameterPriorityComparatorTest.java b/...ties/ParameterPriorityComparatorTest.java → ...ties/ParameterPriorityComparatorTest.java
diff --git a/...r/provider/ToolBehaviourProviderTest.java → ...r/provider/ToolBehaviourProviderTest.java b/...r/provider/ToolBehaviourProviderTest.java → ...r/provider/ToolBehaviourProviderTest.java
diff --git a/...de/camel/editor/utils/MavenUtilsTest.java → ...de/camel/editor/utils/MavenUtilsTest.java b/...de/camel/editor/utils/MavenUtilsTest.java → ...de/camel/editor/utils/MavenUtilsTest.java
diff --git a/editor/tests/org.fusesource.ide.launcher.tests/.classpath b/editor/tests/org.fusesource.ide.launcher.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/editor/tests/org.fusesource.ide.launcher.tests/build.properties b/editor/tests/org.fusesource.ide.launcher.tests/build.properties
@@ -1,4 +1,4 @@
-source.. = src-test/
+source.. = src/test/java/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/...ncher/debug/util/CamelDebugUtilsTest.java → ...ncher/debug/util/CamelDebugUtilsTest.java b/...ncher/debug/util/CamelDebugUtilsTest.java → ...ncher/debug/util/CamelDebugUtilsTest.java
diff --git a/...hing/CamelRunMavenLaunchDelegateTest.java → ...hing/CamelRunMavenLaunchDelegateTest.java b/...hing/CamelRunMavenLaunchDelegateTest.java → ...hing/CamelRunMavenLaunchDelegateTest.java
diff --git a/pom.xml b/pom.xml
@@ -169,14 +169,6 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <testSourceDirectory>src-test/java</testSourceDirectory>
-    <testResources>
-    	<testResource>
-    		<directory>src-test/resources</directory>
-    	</testResource>
-    </testResources>
-
-
     <plugins>
 
       <plugin>

diff --git a/servers/tests/org.fusesource.ide.server.karaf.core.tests/.classpath b/servers/tests/org.fusesource.ide.server.karaf.core.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/servers/tests/org.fusesource.ide.server.karaf.core.tests/build.properties b/servers/tests/org.fusesource.ide.server.karaf.core.tests/build.properties
@@ -1,4 +1,5 @@
-source.. = src-test/
+source.. = src/test/java/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+
diff --git a/...Karaf2xStartupLaunchConfiguratorTest.java → ...Karaf2xStartupLaunchConfiguratorTest.java b/...Karaf2xStartupLaunchConfiguratorTest.java → ...Karaf2xStartupLaunchConfiguratorTest.java
diff --git a/...ore/server/subsystems/KarafUtilsTest.java → ...ore/server/subsystems/KarafUtilsTest.java b/...ore/server/subsystems/KarafUtilsTest.java → ...ore/server/subsystems/KarafUtilsTest.java
diff --git a/transformation/tests/org.jboss.tools.fuse.transformation.core.tests/.classpath b/transformation/tests/org.jboss.tools.fuse.transformation.core.tests/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-test"/>
 	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/transformation/tests/org.jboss.tools.fuse.transformation.core.tests/build.properties b/transformation/tests/org.jboss.tools.fuse.transformation.core.tests/build.properties
@@ -1,4 +1,5 @@
-source.. = src-test/
+source.. = src/test/java/,\
+			src/test/resources/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/...ore.tests/src-test/abcorder/ABCOrder.java → ...ests/src/test/java/abcorder/ABCOrder.java b/...ore.tests/src-test/abcorder/ABCOrder.java → ...ests/src/test/java/abcorder/ABCOrder.java
diff --git a/...ests/src-test/abcorder/ObjectFactory.java → ...src/test/java/abcorder/ObjectFactory.java b/...ests/src-test/abcorder/ObjectFactory.java → ...src/test/java/abcorder/ObjectFactory.java
diff --git a/...n.core.tests/src-test/example/AClass.java → ...e.tests/src/test/java/example/AClass.java b/...n.core.tests/src-test/example/AClass.java → ...e.tests/src/test/java/example/AClass.java
diff --git a/...n.core.tests/src-test/example/BClass.java → ...e.tests/src/test/java/example/BClass.java b/...n.core.tests/src-test/example/BClass.java → ...e.tests/src/test/java/example/BClass.java
diff --git a/...core.tests/src-test/example/DeepList.java → ...tests/src/test/java/example/DeepList.java b/...core.tests/src-test/example/DeepList.java → ...tests/src/test/java/example/DeepList.java
diff --git a/...src-test/example/ListsAndNestedTypes.java → ...est/java/example/ListsAndNestedTypes.java b/...src-test/example/ListsAndNestedTypes.java → ...est/java/example/ListsAndNestedTypes.java
diff --git a/...mation/core/camel/EndpointHelperTest.java → ...mation/core/camel/EndpointHelperTest.java b/...mation/core/camel/EndpointHelperTest.java → ...mation/core/camel/EndpointHelperTest.java
diff --git a/...e/dozer/DozerMapperConfigurationTest.java → ...e/dozer/DozerMapperConfigurationTest.java b/...e/dozer/DozerMapperConfigurationTest.java → ...e/dozer/DozerMapperConfigurationTest.java
diff --git a/...nsformation/core/dozer/DozerUtilTest.java → ...nsformation/core/dozer/DozerUtilTest.java b/...nsformation/core/dozer/DozerUtilTest.java → ...nsformation/core/dozer/DozerUtilTest.java
diff --git a/.../core/dozer/DozerVariableMappingTest.java → .../core/dozer/DozerVariableMappingTest.java b/.../core/dozer/DozerVariableMappingTest.java → .../core/dozer/DozerVariableMappingTest.java
diff --git a/...sts/src-test/xyzorderschema/LineItem.java → ...rc/test/java/xyzorderschema/LineItem.java b/...sts/src-test/xyzorderschema/LineItem.java → ...rc/test/java/xyzorderschema/LineItem.java
diff --git a/...c-test/xyzorderschema/XyzOrderSchema.java → ...t/java/xyzorderschema/XyzOrderSchema.java b/...c-test/xyzorderschema/XyzOrderSchema.java → ...t/java/xyzorderschema/XyzOrderSchema.java