[Amdatu-commits] SVN r177 - in trunk: . integration-tests integration-tests/src/test/java/org/amdatu/test/integration integration-tests/src/test/java/org/amdatu/test/integration/tenant integration-tests/src/test/ja...

[subvers...@amdatu.org]

Author: ivol
Date: Mon Oct 18 10:36:15 2010
New Revision: 177

Log:
[AMDATU-107] Renamed unit-tests to integration-tests

Added:
   trunk/integration-tests/
      - copied from r175, /trunk/unit-tests/
   trunk/integration-tests/pom.xml
      - copied, changed from r176, /trunk/unit-tests/pom.xml
   trunk/integration-tests/src/test/java/org/amdatu/test/integration/
      - copied from r176, 
/trunk/unit-tests/src/test/java/org/amdatu/test/integration/
Removed:
   trunk/integration-tests/src/test/java/org/amdatu/test/tenant/
Modified:
   
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tenant/TenantManagementServiceTest.java
   trunk/platform-bundles/filebased-configuration/pom.xml
   trunk/pom.xml

Copied: trunk/integration-tests/pom.xml (from r176, /trunk/unit-tests/pom.xml)
==============================================================================
--- /trunk/unit-tests/pom.xml   (original)
+++ trunk/integration-tests/pom.xml     Mon Oct 18 10:36:15 2010
@@ -8,16 +8,11 @@
     <version>0.0.5-SNAPSHOT</version>
   </parent>
   <groupId>org.amdatu.platform</groupId>
-  <artifactId>unit-tests</artifactId>
+  <artifactId>integration-tests</artifactId>
   <packaging>bundle</packaging>
-  <name>Amdatu Unit Tests</name>
-  <description>This bundle contains unit tests for the project</description>
+  <name>Amdatu Integration Tests</name>
+  <description>This bundle contains integration tests for the 
project</description>
 
-  <!-- See issues:
-    http://issues.ops4j.org/browse/PAXEXAM-81
-    http://svn.apache.org/repos/asf/felix/releases/karaf-1.0.0/itests/pom.xml
-    http://pastebin.com/nUjAZENT
-  -->  
   <dependencies>
     <!-- Test scope dependencies -->
     <!-- This is required to be first so that pax-exam classloader is not 
messed up with a newer version of felix
@@ -91,7 +86,13 @@
     </dependency>
   </dependencies>
   
- <build>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/test/java/org/amdatu/test/integration/tenant</directory>
+        <filtering>true</filtering>
+      </resource>  
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: 
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tenant/TenantManagementServiceTest.java
==============================================================================
--- 
/trunk/unit-tests/src/test/java/org/amdatu/test/integration/tenant/TenantManagementServiceTest.java
 (original)
+++ 
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tenant/TenantManagementServiceTest.java
   Mon Oct 18 10:36:15 2010
@@ -25,6 +25,8 @@
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
+import java.io.File;
+import java.io.FileFilter;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -61,6 +63,16 @@
 
     @Configuration
     public Option[] configure() {
+        // First get our own JAR 
+        FileFilter ff = new FileFilter (){
+            public boolean accept(File pathname) {
+                return 
pathname.getName().startsWith("org.amdatu.platform.integration-tests-") 
+                && pathname.getName().endsWith(".jar");
+            }
+        };
+        File integrationTestJarFile = new File("target").listFiles(ff)[0];
+        System.out.println(">  TESTING:  Deploy integration test file: '" + 
integrationTestJarFile.getAbsolutePath() + "'");
+
         return options(
             mavenConfiguration(),
 
@@ -96,7 +108,7 @@
                 
mavenBundle().groupId("org.amdatu.platform").artifactId("tenant-service").versionAsInProject(),
                 
                 // And finally deploy ourselves
-                
bundle("file:target/org.amdatu.platform.unit-tests-0.0.5-SNAPSHOT.jar")));
+                bundle(integrationTestJarFile.toURI().toString())));
     }
 
     @Test

Modified: trunk/platform-bundles/filebased-configuration/pom.xml
==============================================================================
--- trunk/platform-bundles/filebased-configuration/pom.xml      (original)
+++ trunk/platform-bundles/filebased-configuration/pom.xml      Mon Oct 18 
10:36:15 2010
@@ -8,7 +8,6 @@
         <version>0.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.amdatu.platform</groupId>
     <artifactId>filebased-configuration</artifactId>
     <packaging>bundle</packaging>

Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml       (original)
+++ trunk/pom.xml       Mon Oct 18 10:36:15 2010
@@ -185,7 +185,7 @@
     <module>gadget-bundles</module>
     <module>libraries</module>
     <module>example-bundles</module>
-    <module>unit-tests</module>
+    <module>integration-tests</module>
   </modules>
   
   <repositories>