From bc1c8ab4c48c3a81824dac27ba71a8d1277797b9 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 4 Dec 2008 21:09:28 +0000 Subject: Merge itest changes from sca-equinox branch into trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723439 13f79535-47bb-0310-9956-ffa450edef68 --- .../databindings/jaxb/topdown/DatabindingTestCase.java | 17 ++++++++++------- .../jaxb/topdown/PrimitivesDatabindingTestCase.java | 14 +++++++------- .../jaxb/topdown/StandardTypesDatabindingTestCase.java | 14 +++++++------- 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'java/sca/itest/databindings') diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java index da2fc8b108..35f69608e7 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java @@ -27,9 +27,9 @@ import java.util.Map; import junit.framework.Assert; import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Client; +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.Test; @@ -39,8 +39,8 @@ import org.junit.Test; */ public class DatabindingTestCase { - private static SCAClient client; - private static SCANode node; + private static Client client; + private static Node node; /** * Runs once before running the tests @@ -48,10 +48,13 @@ public class DatabindingTestCase { @BeforeClass public static void setUp() throws Exception { try { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); + NodeFactory nodeFactory = NodeFactory.newInstance(); node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null); node.start(); - client = (SCAClient)node; + client = (Client)node; + }catch(Throwable e) { + e.printStackTrace(); + } }catch(Throwable e) { e.printStackTrace(); } diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java index 65b8a5abc3..4a292a8b7a 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java @@ -22,9 +22,9 @@ package org.apache.tuscany.sca.itest.databindings.jaxb.topdown; import junit.framework.Assert; import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Client; +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.Test; @@ -34,18 +34,18 @@ import org.junit.Test; */ public class PrimitivesDatabindingTestCase { - private static SCAClient domain; - private static SCANode node; + private static Client domain; + private static Node node; /** * Runs before each test method */ @BeforeClass public static void setUp() throws Exception { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); + NodeFactory nodeFactory = NodeFactory.newInstance(); node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/primitivesservice.composite", null); node.start(); - domain = (SCAClient)node; + domain = (Client)node; } /** diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java index 6ed9026089..263b2f81eb 100644 --- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java +++ b/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java @@ -55,9 +55,9 @@ import org.apache.axiom.attachments.ByteArrayDataSource; import org.apache.tuscany.sca.databinding.xml.String2Node; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; +import org.apache.tuscany.sca.node.Client; +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; @@ -69,18 +69,18 @@ import org.xml.sax.InputSource; */ public class StandardTypesDatabindingTestCase { - private static SCAClient domain; - private static SCANode node; + private static Client domain; + private static Node node; /** * Runs once before the tests */ @BeforeClass public static void setUp() throws Exception { - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); + NodeFactory nodeFactory = NodeFactory.newInstance(); node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/standard-types-service.composite", null); node.start(); - domain = (SCAClient)node; + domain = (Client)node; } /** -- cgit v1.2.3