You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/05/05 08:47:17 UTC
svn commit: r535462 - in
/incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec:
ComponentTestCase.java CompositeTestCase.java
Author: rfeng
Date: Fri May 4 23:47:16 2007
New Revision: 535462
URL: http://svn.apache.org/viewvc?view=rev&rev=535462
Log:
Convert two test cases into JUnit 4
Modified:
incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
Modified: incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java?view=diff&rev=535462&r1=535461&r2=535462
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java Fri May 4 23:47:16 2007
@@ -18,48 +18,58 @@
*/
package org.apache.tuscany.sca.test.spec;
-import java.util.Date;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
-import junit.framework.TestCase;
+import java.util.Date;
import org.apache.tuscany.host.embedded.SCARuntime;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
-public class ComponentTestCase extends TestCase {
- private MyService myService;
- private MyServiceByDate myServiceByDate;
- private MyListService myListService;
- private MyListServiceByYear myListServiceByYear;
- private MyService myNCService;
- private MyListService myListServiceFor2006;
+public class ComponentTestCase {
+ private static MyService myService;
+ private static MyServiceByDate myServiceByDate;
+ private static MyListService myListService;
+ private static MyListServiceByYear myListServiceByYear;
+ private static MyService myNCService;
+ private static MyListService myListServiceFor2006;
- private CompositeContext context;
+ private static CompositeContext context;
+ @Test
public void testDefaultProperty() {
assertEquals("RTP", myService.getLocation());
assertEquals("2006", myService.getYear());
}
+ @Test
public void testDefaultService() {
assertEquals(myService.nextHoliday(), myServiceByDate.nextHolidayByDate(new Date()));
assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2006)[0]);
}
+ @Test
public void testOverrideProperty() {
assertEquals("NC", myNCService.getLocation());
assertEquals("2007", myNCService.getYear());
}
+ @Test
public void testServiceWithOverrideProperty() {
assertFalse(myNCService.nextHoliday() == myService.nextHoliday());
assertEquals(myListServiceFor2006.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2006)[0]);
}
+ @Test
public void testContext() {
//FIXME TUSCANY-1174 - Need support for @ComponentName
/*
@@ -93,7 +103,8 @@
}
- protected void setUp() throws Exception {
+ @BeforeClass
+ public static void init() throws Exception {
SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MyService");
@@ -104,7 +115,9 @@
myListServiceFor2006 = context.locateService(MyListService.class, "MyListServiceFor2006");
}
- protected void tearDown() throws Exception {
- SCARuntime.stop();
+ @AfterClass
+ public static void destroy() throws Exception {
+ SCARuntime.stop();
}
+
}
Modified: incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java?view=diff&rev=535462&r1=535461&r2=535462
==============================================================================
--- incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/spec-api/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java Fri May 4 23:47:16 2007
@@ -18,46 +18,51 @@
*/
package org.apache.tuscany.sca.test.spec;
-import java.util.Date;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
-import junit.framework.TestCase;
+import java.util.Date;
import org.apache.tuscany.host.embedded.SCARuntime;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
-public class CompositeTestCase extends TestCase {
- private MyService myService;
- private MyServiceByDate myServiceByDate;
- private MyListService myListService;
- private MyListServiceByYear myListServiceByYear;
+public class CompositeTestCase {
+ private static MyService myService;
+ private static MyServiceByDate myServiceByDate;
+ private static MyListService myListService;
+ private static MyListServiceByYear myListServiceByYear;
- private CompositeContext context;
+ private static CompositeContext context;
+ @Test
public void testOverrideProperty() {
assertEquals("CARY", myService.getLocation());
assertEquals("2007", myService.getYear());
}
+ @Test
public void testDefaultService() {
assertEquals(myService.nextHoliday(), myServiceByDate.nextHolidayByDate(new Date()));
assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2007)[0]);
}
+ @Test
public void testContext() {
- //FIXME TUSCANY-1174 - Need support for @ComponentName
+ // FIXME TUSCANY-1174 - Need support for @ComponentName
/*
- assertNotNull("Service component name is null", myService.getComponentName());
- assertNotNull("service context is null", myService.getContext());
-
- System.out.println("Service component name :" + myService.getComponentName());
- System.out.println("service context :" + myService.getContext());
-
- test(context);
- */
+ * assertNotNull("Service component name is null",
+ * myService.getComponentName()); assertNotNull("service context is
+ * null", myService.getContext()); System.out.println("Service component
+ * name :" + myService.getComponentName()); System.out.println("service
+ * context :" + myService.getContext()); test(context);
+ */
}
private void test(CompositeContext context) {
@@ -76,21 +81,24 @@
private void display(RequestContext context) {
System.out.println("\tService name:" + context.getServiceName());
System.out.println("\tSecurity subject:" + context.getSecuritySubject());
- //System.out.println("\tService reference:" + (Object)context.getServiceReference());
+ // System.out.println("\tService reference:" +
+ // (Object)context.getServiceReference());
}
- protected void setUp() throws Exception {
- SCARuntime.start("CompositeTest.composite");
+ @BeforeClass
+ public static void init() throws Exception {
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MyServiceInRecursiveMyService");
myServiceByDate = context.locateService(MyServiceByDate.class, "MyServiceInRecursiveMyServiceByDate");
myListService = context.locateService(MyListService.class, "MyServiceInRecursiveMyListService");
- myListServiceByYear =
- context.locateService(MyListServiceByYear.class, "MyServiceInRecursiveMyListServiceByYear");
+ myListServiceByYear = context.locateService(MyListServiceByYear.class,
+ "MyServiceInRecursiveMyListServiceByYear");
}
- protected void tearDown() throws Exception {
- SCARuntime.stop();
+ @AfterClass
+ public static void destroy() throws Exception {
+ SCARuntime.stop();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org