Author: rfeng
Date: Thu Feb 25 22:57:23 2010
New Revision: 916482
URL: http://svn.apache.org/viewvc?rev=916482&view=rev
Log:
Workaround TUSCANY-3138 to enable the test cases
Added:
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
- copied unchanged from r915601,
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
- copied unchanged from r915601,
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
Removed:
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InterfacesTest.composite
tuscany/sca-java-2.x/trunk/itest/interfaces/src/main/resources/InvalidRemoteAttribute.composite
Modified:
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java?rev=916482&r1=916481&r2=916482&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
Thu Feb 25 22:57:23 2010
@@ -22,22 +22,25 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import java.io.File;
+
import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-...@ignore("TUSCANY-3138")
+// @Ignore("TUSCANY-3138")
public class InterfacesTestCase {
+ private static final String PKG =
"org/apache/tuscany/sca/itest/interfaces/valid";
+ private static String ROOT = new File("target/classes/" +
PKG).toURI().toString();
+
private static Node node;
@BeforeClass
public static void init() throws Exception {
- String location =
ContributionLocationHelper.getContributionLocation("InterfacesTest.composite");
+ String location = ROOT;
node =
NodeFactory.newInstance().createNode("InterfacesTest.composite", new
Contribution("c1", location));
node.start();
}
Modified:
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java?rev=916482&r1=916481&r2=916482&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
Thu Feb 25 22:57:23 2010
@@ -19,21 +19,24 @@
package org.apache.tuscany.sca.itest.interfaces;
+import java.io.File;
+
import org.apache.tuscany.sca.interfacedef.InvalidAnnotationException;
import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.Test;
public class InvalidRemoteAttributeTestCase {
+ private static final String PKG =
"org/apache/tuscany/sca/itest/interfaces/invalid";
+ private static String ROOT = new File("target/classes/" +
PKG).toURI().toString();
@Test
public void testInvalidRemoteAttribute() throws Exception {
Node node = null;
try {
- String location =
ContributionLocationHelper.getContributionLocation("InvalidRemoteAttribute.composite");
+ String location = ROOT;
node =
NodeFactory.newInstance().createNode("InvalidRemoteAttribute.composite", new
Contribution("c1", location));
node.start();
} catch (Exception e) {
