]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 15d1cd7)
NOJIRA moved ServiceLayerTests to new module common-test that is built after authoriz...
authorSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 19 May 2010 20:57:19 +0000 (20:57 +0000)
committerSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 19 May 2010 20:57:19 +0000 (20:57 +0000)
test: all service tests

services/authorization-mgt/import/src/main/resources/import-data/import-permissions-roles.xml patch | blob | history
services/authorization-mgt/import/src/main/resources/import-data/import-permissions.xml patch | blob | history
services/common-test/pom.xml [new file with mode: 0644] patch | blob
services/common-test/src/test/java/org/collectionspace/services/client/test/ServiceLayerTest.java [moved from services/client/src/test/java/org/collectionspace/services/client/test/ServiceLayerTest.java with 100% similarity] patch | blob | history
services/common-test/src/test/resources/log4j.properties [new file with mode: 0644] patch | blob
services/pom.xml patch | blob | history

diff --git a/services/authorization-mgt/import/src/main/resources/import-data/import-permissions-roles.xml b/services/authorization-mgt/import/src/main/resources/import-data/import-permissions-roles.xml
index 8aa8b869e39a9d7491ecc2fa15b5b0341024aec0..f90ba976b2bdf0768ae1447303bd369faf75008f 100644 (file)
--- a/services/authorization-mgt/import/src/main/resources/import-data/import-permissions-roles.xml
+++ b/services/authorization-mgt/import/src/main/resources/import-data/import-permissions-roles.xml
@@ -3,7 +3,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>05afcbb5-42f2-4d93-a2c8-aaaed450c306</permissionId>
+            <permissionId>a4017e3d-1eef-42b1-bdb7-8443d681707c</permissionId>
             <resourceName>collectionobjects</resourceName>
         </permission>
         <role>
@@ -14,7 +14,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>4891efb7-91c8-45f8-920e-ffc86e17b3da</permissionId>
+            <permissionId>66d54998-a1a1-4c64-9728-2b6d8b9b61df</permissionId>
             <resourceName>intakes</resourceName>
         </permission>
         <role>
@@ -25,7 +25,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>20e8c44d-103c-4b1d-bee0-80e13c02d472</permissionId>
+            <permissionId>07e47d8a-1aa6-440b-b30b-a2d42d8023a1</permissionId>
             <resourceName>loansin</resourceName>
         </permission>
         <role>
@@ -36,7 +36,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>544cfaee-455f-4daa-a037-c4b0907bbf20</permissionId>
+            <permissionId>476a773b-83ad-4383-8761-c92930bf527c</permissionId>
             <resourceName>loansout</resourceName>
         </permission>
         <role>
@@ -47,7 +47,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>f16f4cd8-62ba-4a43-932f-38521f0fa18d</permissionId>
+            <permissionId>b0144782-e289-4847-bb67-e9b5c0412887</permissionId>
             <resourceName>movements</resourceName>
         </permission>
         <role>
@@ -58,7 +58,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>a20baf6b-d476-4106-a836-1b600bf669f8</permissionId>
+            <permissionId>8cc25692-4d52-40e2-afbc-b95a79db3b0a</permissionId>
             <resourceName>vocabularies</resourceName>
         </permission>
         <role>
@@ -69,7 +69,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>779a0b7e-27eb-4621-8920-588c296e12ee</permissionId>
+            <permissionId>d2f87bd9-9ea6-4b39-aebe-6a0fc6d96594</permissionId>
             <resourceName>vocabularyitems</resourceName>
         </permission>
         <role>
@@ -80,7 +80,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>2d873988-7339-42ad-b432-ebb77df34910</permissionId>
+            <permissionId>80e32ee8-4740-4b48-a3ba-aec706172146</permissionId>
             <resourceName>orgauthorities</resourceName>
         </permission>
         <role>
@@ -91,7 +91,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>d0623091-4e67-45ae-8aff-8e91d51cf49a</permissionId>
+            <permissionId>49167e68-8001-45b4-abef-c042032e488e</permissionId>
             <resourceName>organizations</resourceName>
         </permission>
         <role>
@@ -102,7 +102,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>3d4824f9-1f98-436d-a7bb-3a24e972e8e4</permissionId>
+            <permissionId>3c69a90d-35b9-4bc0-9360-46977368f86f</permissionId>
             <resourceName>personauthorities</resourceName>
         </permission>
         <role>
@@ -113,7 +113,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>d5119e61-b858-413c-a756-8effa0b390b4</permissionId>
+            <permissionId>3cd1d1b5-1d7b-4795-9e74-26511325720f</permissionId>
             <resourceName>persons</resourceName>
         </permission>
         <role>
@@ -124,7 +124,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>467a5287-f758-4300-9cb4-ed3a1ad36aee</permissionId>
+            <permissionId>0ec19a72-a210-44b9-a10e-817fea57276f</permissionId>
             <resourceName>acquisitions</resourceName>
         </permission>
         <role>
@@ -135,7 +135,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>0745fb96-cf8d-4cfa-93ed-9b3d078e206e</permissionId>
+            <permissionId>808c7f90-16a1-42a6-a24b-06327728b2e4</permissionId>
             <resourceName>relations</resourceName>
         </permission>
         <role>
@@ -146,7 +146,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>cc931e6c-dde9-41fa-be84-ae14329f6845</permissionId>
+            <permissionId>5840f553-3fa1-4254-8442-7f4e76dfbd08</permissionId>
             <resourceName>accounts</resourceName>
         </permission>
         <role>
@@ -157,7 +157,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>abfdb597-6432-42d8-9b82-93d520c5275a</permissionId>
+            <permissionId>fc89633a-56c6-4d20-9022-dbf7919afe0c</permissionId>
             <resourceName>dimensions</resourceName>
         </permission>
         <role>
@@ -168,7 +168,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>766015d1-5fff-4bc7-ba1c-1d17b71a47fe</permissionId>
+            <permissionId>f0806b7f-5dca-4aed-bae9-b25fba378f95</permissionId>
             <resourceName>contacts</resourceName>
         </permission>
         <role>
@@ -179,7 +179,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>f3269b91-2a01-4ddc-9f50-b29ddd1775ee</permissionId>
+            <permissionId>173a185c-b2d6-4fae-8c33-89b2e34dbeea</permissionId>
             <resourceName>authorization/roles</resourceName>
         </permission>
         <role>
@@ -190,7 +190,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>a00b8aa8-8965-4d8f-811f-51962310336a</permissionId>
+            <permissionId>d82cdea5-6643-4aac-a94b-5b5808a6d0e8</permissionId>
             <resourceName>authorization/permissions</resourceName>
         </permission>
         <role>
@@ -201,7 +201,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>983be9bf-f016-4673-8ada-ace546dd3254</permissionId>
+            <permissionId>9955709b-267a-4da1-a569-76a2520af6e7</permissionId>
             <resourceName>authorization/permroles</resourceName>
         </permission>
         <role>
@@ -212,7 +212,7 @@
     <permissionRole>
         <subject>ROLE</subject>
         <permission>
-            <permissionId>1e73718d-c646-485a-a017-eb17eeb3aba2</permissionId>
+            <permissionId>8c816fa9-d1df-4c8c-95a0-7972d214ae09</permissionId>
             <resourceName>accounts/accountroles</resourceName>
         </permission>
         <role>
diff --git a/services/authorization-mgt/import/src/main/resources/import-data/import-permissions.xml b/services/authorization-mgt/import/src/main/resources/import-data/import-permissions.xml
index aa58510eb8cdf1777b9977eb81c1f1224e497e79..22fb69b4c82ff70a2ca73ba1fbfa296486c040cc 100644 (file)
--- a/services/authorization-mgt/import/src/main/resources/import-data/import-permissions.xml
+++ b/services/authorization-mgt/import/src/main/resources/import-data/import-permissions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ns2:permissions_list xmlns:ns2="http://collectionspace.org/services/authorization">
-    <permission csid="05afcbb5-42f2-4d93-a2c8-aaaed450c306">
+    <permission csid="a4017e3d-1eef-42b1-bdb7-8443d681707c">
         <resourceName>collectionobjects</resourceName>
         <action>
             <name>CREATE</name>
@@ -20,7 +20,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="4891efb7-91c8-45f8-920e-ffc86e17b3da">
+    <permission csid="66d54998-a1a1-4c64-9728-2b6d8b9b61df">
         <resourceName>intakes</resourceName>
         <action>
             <name>CREATE</name>
@@ -40,7 +40,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="20e8c44d-103c-4b1d-bee0-80e13c02d472">
+    <permission csid="07e47d8a-1aa6-440b-b30b-a2d42d8023a1">
         <resourceName>loansin</resourceName>
         <action>
             <name>CREATE</name>
@@ -60,7 +60,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="544cfaee-455f-4daa-a037-c4b0907bbf20">
+    <permission csid="476a773b-83ad-4383-8761-c92930bf527c">
         <resourceName>loansout</resourceName>
         <action>
             <name>CREATE</name>
@@ -80,7 +80,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="f16f4cd8-62ba-4a43-932f-38521f0fa18d">
+    <permission csid="b0144782-e289-4847-bb67-e9b5c0412887">
         <resourceName>movements</resourceName>
         <action>
             <name>CREATE</name>
@@ -100,7 +100,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="a20baf6b-d476-4106-a836-1b600bf669f8">
+    <permission csid="8cc25692-4d52-40e2-afbc-b95a79db3b0a">
         <resourceName>vocabularies</resourceName>
         <action>
             <name>CREATE</name>
@@ -120,7 +120,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="779a0b7e-27eb-4621-8920-588c296e12ee">
+    <permission csid="d2f87bd9-9ea6-4b39-aebe-6a0fc6d96594">
         <resourceName>vocabularyitems</resourceName>
         <action>
             <name>CREATE</name>
@@ -140,7 +140,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="2d873988-7339-42ad-b432-ebb77df34910">
+    <permission csid="80e32ee8-4740-4b48-a3ba-aec706172146">
         <resourceName>orgauthorities</resourceName>
         <action>
             <name>CREATE</name>
@@ -160,7 +160,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="d0623091-4e67-45ae-8aff-8e91d51cf49a">
+    <permission csid="49167e68-8001-45b4-abef-c042032e488e">
         <resourceName>organizations</resourceName>
         <action>
             <name>CREATE</name>
@@ -180,7 +180,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="3d4824f9-1f98-436d-a7bb-3a24e972e8e4">
+    <permission csid="3c69a90d-35b9-4bc0-9360-46977368f86f">
         <resourceName>personauthorities</resourceName>
         <action>
             <name>CREATE</name>
@@ -200,7 +200,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="d5119e61-b858-413c-a756-8effa0b390b4">
+    <permission csid="3cd1d1b5-1d7b-4795-9e74-26511325720f">
         <resourceName>persons</resourceName>
         <action>
             <name>CREATE</name>
@@ -220,7 +220,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="467a5287-f758-4300-9cb4-ed3a1ad36aee">
+    <permission csid="0ec19a72-a210-44b9-a10e-817fea57276f">
         <resourceName>acquisitions</resourceName>
         <action>
             <name>CREATE</name>
@@ -240,7 +240,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="0745fb96-cf8d-4cfa-93ed-9b3d078e206e">
+    <permission csid="808c7f90-16a1-42a6-a24b-06327728b2e4">
         <resourceName>relations</resourceName>
         <action>
             <name>CREATE</name>
@@ -260,7 +260,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="cc931e6c-dde9-41fa-be84-ae14329f6845">
+    <permission csid="5840f553-3fa1-4254-8442-7f4e76dfbd08">
         <resourceName>accounts</resourceName>
         <action>
             <name>CREATE</name>
@@ -280,7 +280,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="abfdb597-6432-42d8-9b82-93d520c5275a">
+    <permission csid="fc89633a-56c6-4d20-9022-dbf7919afe0c">
         <resourceName>dimensions</resourceName>
         <action>
             <name>CREATE</name>
@@ -300,7 +300,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="766015d1-5fff-4bc7-ba1c-1d17b71a47fe">
+    <permission csid="f0806b7f-5dca-4aed-bae9-b25fba378f95">
         <resourceName>contacts</resourceName>
         <action>
             <name>CREATE</name>
@@ -320,7 +320,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="f3269b91-2a01-4ddc-9f50-b29ddd1775ee">
+    <permission csid="173a185c-b2d6-4fae-8c33-89b2e34dbeea">
         <resourceName>authorization/roles</resourceName>
         <action>
             <name>CREATE</name>
@@ -340,7 +340,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="a00b8aa8-8965-4d8f-811f-51962310336a">
+    <permission csid="d82cdea5-6643-4aac-a94b-5b5808a6d0e8">
         <resourceName>authorization/permissions</resourceName>
         <action>
             <name>CREATE</name>
@@ -360,7 +360,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="983be9bf-f016-4673-8ada-ace546dd3254">
+    <permission csid="9955709b-267a-4da1-a569-76a2520af6e7">
         <resourceName>authorization/permroles</resourceName>
         <action>
             <name>CREATE</name>
@@ -380,7 +380,7 @@
         <effect>PERMIT</effect>
         <tenant_id>1</tenant_id>
     </permission>
-    <permission csid="1e73718d-c646-485a-a017-eb17eeb3aba2">
+    <permission csid="8c816fa9-d1df-4c8c-95a0-7972d214ae09">
         <resourceName>accounts/accountroles</resourceName>
         <action>
             <name>CREATE</name>
diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
new file mode 100644 (file)
index 0000000..12e4cf3
--- /dev/null
+++ b/services/common-test/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>org.collectionspace.services.main</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>0.7-SNAPSHOT</version>
+    </parent>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.common-test</artifactId>
+    <version>0.7-SNAPSHOT</version>
+    <name>services.common-test</name>
+    <url>http://maven.apache.org</url>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- External dependencies -->
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>tjws</groupId>
+                    <artifactId>webserver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>jaxrs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+        </dependency>
+        <!-- Set TestNG scope to default (compile), rather than test -->
+        <!-- to allow import(s) in AbstractServiceTest class -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.6</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>collectionspace-services-common-test</finalName>
+    </build>
+</project>
diff --git a/services/common-test/src/test/resources/log4j.properties b/services/common-test/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..18c5103
--- /dev/null
+++ b/services/common-test/src/test/resources/log4j.properties
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R\r
+\r
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender\r
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout\r
+\r
+# Pattern to output the caller's file name and line number.\r
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+log4j.appender.R=org.apache.log4j.RollingFileAppender\r
+log4j.appender.R.File=target/test-client.log\r
+\r
+log4j.appender.R.MaxFileSize=100KB\r
+# Keep one backup file\r
+log4j.appender.R.MaxBackupIndex=1\r
+\r
+log4j.appender.R.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n\r
+\r
+#packages\r
+log4j.logger.org.collectionspace=DEBUG\r
+log4j.logger.org.apache=INFO\r
+log4j.logger.httpclient=INFO\r
+log4j.logger.org.jboss.resteasy=INFO\r
diff --git a/services/pom.xml b/services/pom.xml
index 86f43b02b1e1dd4dc1daa2586063a1ab2ae4af6a..70f7a8a51d536ab45356e63076a5b178aca6c3e6 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -19,6 +19,7 @@
         <module>jaxb</module>
         <module>common</module>
         <module>authorization-mgt</module> <!-- relies on authorization -->
+        <module>common-test</module>
         <module>account</module> <!-- relies on authorization-mgt.client -->
         <module>relation</module>
         <!--        <module>query</module> -->
@@ -40,7 +41,7 @@
         <module>PerformanceTests</module>
         <module>security</module>
     </modules>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.testng</groupId>
@@ -73,7 +74,7 @@
                             </property>
                         </systemProperties>
                     </configuration>
-                </plugin>                
+                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jboss-maven-plugin</artifactId>
@@ -142,7 +143,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -154,10 +155,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>            
-        </plugins>        
+            </plugin>
+        </plugins>
     </build>
-    
+
     <reporting>
         <plugins>
             <plugin>
@@ -248,7 +249,7 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-multipart-provider</artifactId>
                 <version>1.2.GA</version>
-            </dependency>            
+            </dependency>
             <dependency>
                 <groupId>commons-httpclient</groupId>
                 <artifactId>commons-httpclient</artifactId>
@@ -302,4 +303,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
+</project>
\ No newline at end of file