svn commit: r919232 - /tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java

[antelder]

Author: antelder
Date: Thu Mar  4 23:24:20 2010
New Revision: 919232

URL: http://svn.apache.org/viewvc?rev=919232&view=rev
Log:
Move back to the provious version of the runtim ebridge as thats what the 
published jars are still using

Modified:
    
tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java

Modified: 
tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java?rev=919232&r1=919231&r2=919232&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
 Thu Mar  4 23:24:20 2010
@@ -22,6 +22,7 @@
 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;
@@ -46,6 +47,8 @@
     protected NodeFactory launcher;
     protected Node node;
     protected Properties expectedErrorMessages;
+    
+    TestConfiguration testConfiguration = null;
 
     public TuscanyRuntimeBridge() {
         // read test error mapping
@@ -58,18 +61,33 @@
         } 
     }
 
-    public boolean startContribution(String compositeName, String 
contributionLocation, String[] contributionNames) throws Exception {
+    public TestConfiguration getTestConfiguration() {
+        return testConfiguration;
+    }
+
+    public void setTestConfiguration(TestConfiguration testConfiguration) {
+        this.testConfiguration = testConfiguration;
+    }
+
+       public boolean startContribution(String compositeName,
+                       String contributionLocation, String[] contributionNames)
+                       throws Exception {
+               //TODO:
+               return startContribution(contributionLocation, 
contributionNames);
+       }
+       
+    public boolean startContribution(String contributionLocation, String[] 
contributionNames) throws Exception {
         try {
             // Tuscany specific code which starts the contribution(s) holding 
the test
             launcher = NodeFactory.newInstance();
 
             Contribution[] contributions = new 
Contribution[contributionNames.length];
-            String[] contributionURIs = 
getContributionURIs(contributionLocation, contributionNames);
+            String[] contributionURIs = 
getContributionURIs(contributionLocation);
             for (int i = 0; i < contributions.length; i++) {
                 contributions[i] = new Contribution(contributionNames[i], 
contributionURIs[i]);
             } // end for
 
-            node = launcher.createNode(compositeName, contributions);
+            node = launcher.createNode(testConfiguration.getComposite(), 
contributions);
             // Start the node
             node.start();
             
@@ -92,14 +110,21 @@
      * the contribution
      * @return the contribution locations as an array of Strings
      */
-    protected String[] getContributionURIs(String contributionLocation, 
String[] contributionNames) throws Exception {
-        String[] locations = new String[contributionNames.length];
+    protected String[] getContributionURIs(String contributionLocation) throws 
Exception {
+        String[] locations;
+        locations = testConfiguration.getContributionNames();
 
         if (locations != null && contributionLocation != null) {
 
             for (int i = 0; i < locations.length; i++) {
-                String aLocation = contributionLocation.replaceAll("%1", 
contributionNames[i]);
-
+                String aLocation = contributionLocation.replaceAll("%1", 
locations[i]);
+                // Looks like bugs in the oasis code that sometimes still uses 
jars for some
+                if (aLocation.endsWith("_POJO.zip") && 
!aLocation.endsWith("ASM_8005_Java-1.0.zip")) {
+                    aLocation = aLocation.substring(0, aLocation.length()-3) + 
"jar";                  
+                }
+                if (!(new File(aLocation)).exists()) {
+                       aLocation = aLocation.replace(".zip", ".jar");
+                }
                 locations[i] = aLocation;
             } // end for               
         } else {
@@ -123,6 +148,10 @@
             launcher.destroy();
         } // end if
     } // end method stopContribution
+
+    public String getContributionLocation(Class<?> testClass) {
+        return 
ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass());
+    } // end method getContributionLocation
     
     public void checkError(String testName, Throwable ex) throws Throwable { 
               
@@ -146,7 +175,7 @@
         }
         
         // Deal with the case where the message has variable parts within it
-        // marked with the characters ***. Here we tokenize the expected 
string 
+        // marked with the characters ***. Here we tokenize the epected string 
         // and make sure all the individual parts are present in the results 
string
         String expectedMessageParts[] = expectedMessage.split("\\*\\*\\*");