From 3f86e5c908d7db1d85e3f12b0798104654a1e12b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 4 Jun 2009 18:27:19 +0000
Subject: [PATCH] Move unit tests

git-svn-id: https://svn.argeo.org/slc/trunk@2472 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/slc/demo/StartStopDemoTest.java |  2 +-
 .../org.argeo.slc.it.webapp/pom.xml           | 11 ---------
 org.argeo.slc/pom.xml                         | 19 ---------------
 runtime/org.argeo.slc.server/pom.xml          |  2 ++
 .../unit/AbstractHttpClientTestCase.java      |  0
 runtime/org.argeo.slc.support.castor/pom.xml  |  6 -----
 .../unit}/AbstractOsgiRuntimeTestCase.java    |  2 +-
 .../org/argeo/slc/osgi/test/HelloTest.java    |  1 +
 .../slc/osgi/test/PlatformStartStopTest.java  |  1 +
 .../org.argeo.slc.support.hibernate/pom.xml   | 24 -------------------
 runtime/org.argeo.slc.support.simple/pom.xml  |  2 ++
 .../ExecutionFlowDescriptorTestUtils.java     |  0
 .../unit/process/SlcExecutionTestUtils.java   |  0
 .../test/tree/TreeTestResultTestUtils.java    |  0
 .../slc/unit/test/tree/UnitTestTreeUtil.java  |  0
 15 files changed, 8 insertions(+), 62 deletions(-)
 rename runtime/org.argeo.slc.server/src/{test => main}/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java (100%)
 rename runtime/org.argeo.slc.support.equinox/src/{test/java/org/argeo/slc/osgi/test => main/java/org/argeo/slc/equinox/unit}/AbstractOsgiRuntimeTestCase.java (99%)
 rename runtime/org.argeo.slc.support.simple/src/{test => main}/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java (100%)
 rename runtime/org.argeo.slc.support.simple/src/{test => main}/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java (100%)
 rename runtime/org.argeo.slc.support.simple/src/{test => main}/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java (100%)
 rename runtime/org.argeo.slc.support.simple/src/{test => main}/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java (100%)

diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
index 603ac265b..78dc8ac5d 100644
--- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
+++ b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java
@@ -3,7 +3,7 @@ package org.argeo.slc.demo;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.argeo.slc.osgi.test.AbstractOsgiRuntimeTestCase;
+import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase;
 import org.argeo.slc.osgiboot.OsgiBoot;
 
 public class StartStopDemoTest extends AbstractOsgiRuntimeTestCase {
diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index b2f369655..8464e034b 100644
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -12,16 +12,6 @@
 	<name>Argeo SLC Web Application Integration Tests</name>
 	<build>
 		<plugins>
-			<!--
-				<plugin> <groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId> <executions>
-				<execution> <id>copy-dependencies</id>
-				<phase>pre-integration-test</phase> <goals>
-				<goal>copy-dependencies</goal> </goals> <configuration>
-				<overWriteReleases>true</overWriteReleases>
-				<overWriteSnapshots>true</overWriteSnapshots> </configuration>
-				</execution> </executions> </plugin>
-			-->
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -104,7 +94,6 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.server</artifactId>
-			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 665f1dcfd..33e454464 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -221,12 +221,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.simple</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.simple</artifactId>
-				<version>${project.version}</version>
-				<classifier>tests</classifier>
-			</dependency>
 			<!--
 				<dependency> <groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ant</artifactId>
@@ -252,12 +246,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.server</artifactId>
-				<version>${project.version}</version>
-				<classifier>tests</classifier>
-			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.osgiboot</artifactId>
@@ -268,13 +256,6 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.equinox</artifactId>
-				<classifier>tests</classifier>
-				<scope>test</scope>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ws.client</artifactId>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index a81040398..7ca71464f 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -24,6 +24,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<!-- 
 				<executions>
 					<execution>
 						<goals>
@@ -31,6 +32,7 @@
 						</goals>
 					</execution>
 				</executions>
+				 -->
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
diff --git a/runtime/org.argeo.slc.server/src/test/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
similarity index 100%
rename from runtime/org.argeo.slc.server/src/test/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/server/unit/AbstractHttpClientTestCase.java
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index 32d4aa701..1b6e46670 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -76,12 +76,6 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
similarity index 99%
rename from runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java
rename to runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
index 36a0da9f4..7055c063e 100644
--- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/AbstractOsgiRuntimeTestCase.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.osgi.test;
+package org.argeo.slc.equinox.unit;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
index 02d2ad547..2c55612bf 100644
--- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
+++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase;
 import org.argeo.slc.osgiboot.OsgiBoot;
 
 public class HelloTest extends AbstractOsgiRuntimeTestCase {
diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java
index 8fd2dcacb..c7fafd3dd 100644
--- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java
+++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.osgi.test;
 
+import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index ced338e3d..4c06b0ccd 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -35,24 +35,6 @@
 					<instructions>
 						<Fragment-Host>org.argeo.slc.support.simple</Fragment-Host>
 						<Import-Package>*,org.hibernate.proxy</Import-Package>
-
-						<!--
-							<Export-Package> org.argeo.slc.hibernate.* </Export-Package>
-							<Import-Package>*,org.argeo.slc.*;resolution:=optional,
-							org.argeo.slc.execution;resolution:=optional,
-							org.argeo.slc.runtime;resolution:=optional,
-							org.argeo.slc.structure;resolution:=optional,
-							org.argeo.slc.core.structure;resolution:=optional,
-							org.argeo.slc.core.structure.tree;resolution:=optional,
-							org.argeo.slc.core.test;resolution:=optional,
-							org.argeo.slc.core.test.tree;resolution:=optional,
-							org.argeo.slc.core.execution;resolution:=optional,
-							org.argeo.slc.msg;resolution:=optional,
-							org.argeo.slc.msg.process;resolution:=optional,
-							org.argeo.slc.msg.test.tree;resolution:=optional
-							</Import-Package>
-							<Fragment-Host>com.springsource.org.hibernate</Fragment-Host>
-						-->
 					</instructions>
 				</configuration>
 			</plugin>
@@ -63,12 +45,6 @@
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>javax.transaction</groupId>
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index d65ef683a..f05ade58d 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -27,6 +27,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<!-- 
 				<executions>
 					<execution>
 						<goals>
@@ -39,6 +40,7 @@
 						</configuration>
 					</execution>
 				</executions>
+				 -->
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
similarity index 100%
rename from runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/execution/ExecutionFlowDescriptorTestUtils.java
diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
similarity index 100%
rename from runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
similarity index 100%
rename from runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
similarity index 100%
rename from runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
-- 
2.39.2