From: Laramie Crocker <laramie@berkeley.edu>
Date: Tue, 9 Nov 2010 21:13:09 +0000 (+0000)
Subject: NOJIRA commit
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=42a6d4d7648a38c96f13a7d68d9fbb5d724b2f74;p=tmp%2Fjakarta-migration.git

NOJIRA commit
---

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index fd106622a..ca07c07a7 100644
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -94,10 +94,75 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>javax.security</groupId>
+            <artifactId>jaas</artifactId>
+            <version>1.0.01</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-jexl</artifactId>
+            <version>2.0.1</version>
+        </dependency>
     </dependencies>
     
     <build>
         <finalName>collectionspace-services-IntegrationTests</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!-- The way this works, is you call:
+                     cd C:\src\trunk\services\IntegrationTests\
+                        mvn exec:java
+                     or, with an override:
+                        mvn exec:java -DxmlReplayBaseDir=C:/my/override/directory
+                     or:
+                        mvn -DskipTests exec:java -DtestID=testfoo -DtestGroupID=bar -DxmlReplayBaseDir=mojo -DautoDeletePOSTS=true
+                -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>org.collectionspace.services.IntegrationTests.xmlreplay.XmlReplay</mainClass>
+                    <arguments>
+                        <argument>-xmlReplayBaseDir</argument>
+                        <argument>${basedir}/src/test/resources/test-data/xmlreplay</argument>
+                    </arguments>
+                    <systemProperties>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+        </plugins>
     </build>
 </project>
 
diff --git a/services/dimension/client/pom.xml b/services/dimension/client/pom.xml
index 40ac673e0..c9a3bb1da 100644
--- a/services/dimension/client/pom.xml
+++ b/services/dimension/client/pom.xml
@@ -35,6 +35,13 @@
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>${project.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.IntegrationTests</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
diff --git a/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionXmlReplayTest.java b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionXmlReplayTest.java
new file mode 100755
index 000000000..592994b86
--- /dev/null
+++ b/services/dimension/client/src/test/java/org/collectionspace/services/client/test/DimensionXmlReplayTest.java
@@ -0,0 +1,34 @@
+package org.collectionspace.services.client.test;
+
+import org.collectionspace.services.IntegrationTests.xmlreplay.ServiceResult;
+import org.collectionspace.services.IntegrationTests.xmlreplay.XmlReplay;
+import org.collectionspace.services.IntegrationTests.xmlreplay.XmlReplayTest;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+/**
+ * User: laramie
+ * $LastChangedRevision:  $
+ * $LastChangedDate:  $
+ */
+public class DimensionXmlReplayTest extends XmlReplayTest { 
+
+    @Test
+    public void runMaster() throws Exception {
+        XmlReplay replay = createXmlReplayUsingIntegrationTestsModule("../../");
+        List<List<ServiceResult>> list = replay.runMaster("dimension-master.xml");
+        logTestForGroup(list, "runMaster");
+    }
+
+    @Test
+    public void runOneTest() throws Exception {
+        XmlReplay replay = createXmlReplayForModule();
+        replay.readOptionsFromMasterConfigFile("dimension-master.xml");
+        replay.setControlFileName("dimension.xml");
+
+        ServiceResult res = replay.runTest("dimensionTestGroup", "dimension1");
+        logTest(res, "runOneTest");
+    }
+
+}
diff --git a/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension-master.xml b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension-master.xml
new file mode 100755
index 000000000..c78d5a80e
--- /dev/null
+++ b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension-master.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmlReplayMaster>
+    <protoHostPort>http://localhost:8280</protoHostPort>
+    
+    <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
+    <dump payloads="false" dumpServiceResult="minimal" />
+    
+    <auths default="test">
+       <auth ID="test">dGVzdDp0ZXN0</auth>
+    </auths>
+
+    
+    <run controlFile="./dimension.xml" testGroup="dimensionTestGroup" />
+    
+</xmlReplayMaster>
+
diff --git a/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension.xml b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension.xml
new file mode 100755
index 000000000..556027d95
--- /dev/null
+++ b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmlReplay>
+    <auths>
+        <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
+        <auth ID="test">dGVzdDp0ZXN0</auth>
+        <auth ID="bigbird2010">YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA=</auth>
+    </auths>
+    
+   <!-- ================================================================================ -->
+    
+   <testGroup ID="dimensionTestGroup" autoDeletePOSTS="false">
+        <!-- should fail on auth="bigbird2010" since bigbird2010 is not defined on back end. -->
+        <test ID="dimension1"  auth="bigbird2010">
+            <expectedCodes>403</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/dimensions/</uri>
+            <part>
+                <label>dimensions_common</label>
+                <filename>dimension/1.xml</filename>
+            </part>
+        </test>
+
+        <!-- should succeed on auth="test" since test is admin user. -->
+        <test ID="dimension2"  auth="test">
+            <method>POST</method>
+            <uri>/cspace-services/dimensions/</uri>
+            <part>
+                <label>dimensions_common</label>
+                <filename>dimension/1.xml</filename>
+            </part>
+        </test>
+
+        
+    </testGroup>
+</xmlReplay>
+        
+        
\ No newline at end of file
diff --git a/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension/1.xml b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension/1.xml
new file mode 100755
index 000000000..6867ddfaf
--- /dev/null
+++ b/services/dimension/client/src/test/resources/test-data/xmlreplay/dimension/1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:dimensions_common
+xmlns:ns2="http://collectionspace.org/services/dimension"
+xmlns:ns3="http://collectionspace.org/services/jaxb">
+  <dimension>dimensionType-1288727556164</dimension>
+  <value>entryNumber-1288727556164</value>
+  <valueDate>entryDate-1288727556164</valueDate>
+</ns2:dimensions_common>
+