You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/13 10:01:58 UTC
svn commit: r814278 - in
/tuscany/sandbox/travelsample/contributions/calendar: pom.xml
src/test/java/scatours/calendar/CalendarTestCase.java
src/test/resources/META-INF/ src/test/resources/META-INF/sca-contribution.xml
Author: nash
Date: Sun Sep 13 08:01:57 2009
New Revision: 814278
URL: http://svn.apache.org/viewvc?rev=814278&view=rev
Log:
Convert contributions/calendar test case from host-embedded to Node API
Added:
tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/
tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
Modified:
tuscany/sandbox/travelsample/contributions/calendar/pom.xml
tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
Modified: tuscany/sandbox/travelsample/contributions/calendar/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/pom.xml?rev=814278&r1=814277&r2=814278&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/pom.xml Sun Sep 13 08:01:57 2009
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>1.6-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-node-runtime</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -48,7 +56,6 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java?rev=814278&r1=814277&r2=814278&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java Sun Sep 13 08:01:57 2009
@@ -18,32 +18,39 @@
*/
package scatours.calendar;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import com.tuscanyscatours.calendar.Calendar;
/**
* This shows how to test the Calculator service component.
*/
-public class CalendarTestCase extends TestCase {
-
- private Calendar calendar;
- private SCADomain scaDomain;
+public class CalendarTestCase {
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("calendar.composite");
- calendar = scaDomain.getService(Calendar.class, "Calendar");
- }
+ private SCANode node;
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
+ @Before
+ public void startNode() throws Exception {
+ node = SCANodeFactory.newInstance().createSCANode("calendar.composite",
+ new SCAContribution("calendar", "./target/classes"),
+ new SCAContribution("calendar-test", "./target/test-classes"));
+ node.start();
}
+ @Test
public void testCalendar() throws Exception {
+ Calendar calendar = ((SCAClient)node).getService(Calendar.class, "Calendar");
System.out.println(calendar.getEndDate("07/10/96 04:05", 3));
}
+
+ @After
+ public void stopNode() throws Exception {
+ node.stop();
+ }
}
Added: tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml?rev=814278&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml Sun Sep 13 08:01:57 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <import.java package="com.tuscanyscatours.calendar" />
+ <import.java package="com.tuscanyscatours.calendar.impl" />
+</contribution>