Switch to using the latest jci otests (r94).

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998036 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 11 insertions, 21 deletions

diff --git a/sca-java-2.x/trunk/compliance-tests/policy/pom.xml b/sca-java-2.x/trunk/compliance-tests/policy/pom.xml
index 548716f02f..4d4b4186ee 100644
--- a/sca-java-2.x/trunk/compliance-tests/policy/pom.xml
+++ b/sca-java-2.x/trunk/compliance-tests/policy/pom.xml
@@ -34,13 +34,14 @@
             <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->

             <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>oasis-policy-test-runner</artifactId>

-            <version>1.0-SNAPSHOT</version>

+            <artifactId>tuscany-otests-policy-tests</artifactId>

+            <version>2.0-SNAPSHOT</version>

         </dependency>

 

         <dependency>

-            <groupId>org.apache.tuscany.sca.shades</groupId>

-            <artifactId>tuscany-base</artifactId>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-feature-base</artifactId>

+            <type>pom</type>

             <version>2.0-SNAPSHOT</version>

         </dependency>

 

@@ -78,13 +79,10 @@
          <artifactId>maven-surefire-plugin</artifactId>

          <configuration>

            <excludes>

-              <!-- 3002 is no longer part of the suite and 4015/4016 are tests for no optional support -->

+              <!-- 3002 is no longer part of the suite and 4015/4016 are tests for optional support that Tuscany doesn't provide -->

               <exclude>**/POL_3002_TestCase.java</exclude>

               <exclude>**/POL_4015_TestCase.java</exclude>

               <exclude>**/POL_4016_TestCase.java</exclude>

-              

-              <!-- 3001 fails due to a Tuscany bug in the RI based WS binding -->

-              <exclude>**/POL_3001_TestCase.java</exclude>

            </excludes>

          </configuration>

       </plugin>

@@ -104,14 +102,14 @@
                  <artifactItem>

                    <groupId>org.apache.tuscany.sca</groupId>

                    <artifactId>oasis-policy-contributions</artifactId>

-                   <version>1.0-SNAPSHOT</version>

+                   <version>2.0-SNAPSHOT</version>

                    <type>zip</type>

                    <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>

                  </artifactItem>

                  <artifactItem>

                    <groupId>org.apache.tuscany.sca</groupId>

-                   <artifactId>oasis-policy-test-runner</artifactId>

-                   <version>1.0-SNAPSHOT</version>

+                   <artifactId>tuscany-otests-policy-tests</artifactId>

+                   <version>2.0-SNAPSHOT</version>

                    <type>jar</type>

                    <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>

                    <outputDirectory>${project.build.directory}/test-classes</outputDirectory>

diff --git a/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index ac2759114f..a6ee41aab6 100644
--- a/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

 

 import java.io.BufferedWriter;

-import java.io.File;

 import java.io.FileWriter;

 import java.io.IOException;

 import java.io.InputStream;

@@ -61,10 +60,7 @@ public class TuscanyRuntimeBridge implements RuntimeBridge {
     public boolean startContribution(String compositeName, String contributionLocation, String[] contributionNames) throws Exception {

         try {

             // Tuscany specific code which starts the contribution(s) holding the test

-            Properties ps = new Properties();

-            ps.setProperty("defaultScheme", "vm");

-            ps.setProperty("org.apache.tuscany.sca.binding.ws.jaxws.ri.JAXWSBindingProviderFactory.defaultPort", "8080");

-            launcher = NodeFactory.newInstance(ps);

+            launcher = NodeFactory.newInstance();

 

             Contribution[] contributions = new Contribution[contributionNames.length];

             String[] contributionURIs = getContributionURIs(contributionLocation, contributionNames);

@@ -103,10 +99,6 @@ public class TuscanyRuntimeBridge implements RuntimeBridge {
             for (int i = 0; i < locations.length; i++) {

                 String aLocation = contributionLocation.replaceAll("%1", contributionNames[i]);

 

-                if (!(new File(aLocation)).exists()) {

-                    aLocation = aLocation.replace(".zip", ".jar");

-                }

-

                 locations[i] = aLocation;

             } // end for    	  	

         } else {

diff --git a/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
index 0d8cc27a45..0347fc3ec5 100644
--- a/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
+++ b/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
@@ -26,5 +26,5 @@ org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.Tuscany
 

 # The location of the contributions for the test suite

 # %1 represents the placement of the name of each contribution into the location URI

-org.oasis.sca.tests.assembly.contribution.location=target/oasis-contributions/%1.zip

+org.oasis.sca.tests.assembly.contribution.location=target/oasis-contributions/%1/target/%1.zip