You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/03/15 01:00:43 UTC

svn commit: r518390 - in /incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src: main/java/org/apache/tuscany/sca/test/spec/ main/java/org/apache/tuscany/sca/test/spec/impl/ main/resources/ test/java/org/apache/tuscany/sca/test/spec/

Author: lresende
Date: Wed Mar 14 17:00:42 2007
New Revision: 518390

URL: http://svn.apache.org/viewvc?view=rev&rev=518390
Log:
[sca-integration-branch] Workarounds for know JIRA issues, and commenting tests that have no workaround and are waiting for JIRA fixes

Modified:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/CompositeTest.composite
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyListServiceByYear.java Wed Mar 14 17:00:42 2007
@@ -22,5 +22,6 @@
 
 @Remotable
 public interface MyListServiceByYear {
-    String[] getHolidays(int year);
+    //FIXME renaming method due to TUSCANY-1173. Original name getHolidays
+    String[] getHolidaysByYear(int year);
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/MyServiceByDate.java Wed Mar 14 17:00:42 2007
@@ -24,5 +24,6 @@
 
 @Remotable
 public interface MyServiceByDate {
-    Date nextHoliday(Date date);
+    //FIXME renaming method due to TUSCANY-1173. Original name nextHoliday
+    Date nextHolidayByDate(Date date);
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyListServiceImpl.java Wed Mar 14 17:00:42 2007
@@ -42,10 +42,10 @@
     protected String year = "2006";
 
     public String[] getHolidays() {
-        return getHolidays(new Integer(year).intValue());
+        return getHolidaysByYear(new Integer(year).intValue());
     }
 
-    public String[] getHolidays(int year) {
+    public String[] getHolidaysByYear(int year) {
         MyListService myService;
         if (myListServicesList != null) {
             for (int i = 0; i < myListServicesList.size(); i++) {

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyServiceImpl.java Wed Mar 14 17:00:42 2007
@@ -59,11 +59,11 @@
 
     public Date nextHoliday() {
 
-        return nextHoliday(new Date());
+        return nextHolidayByDate(new Date());
     }
 
     @SuppressWarnings("deprecation")
-    public Date nextHoliday(Date today) {
+    public Date nextHolidayByDate(Date today) {
         Date d1;
         String[] days = getHolidays();
         for (int j = 0; j < days.length; j++) {
@@ -74,7 +74,7 @@
         return null;
     }
 
-    public String[] getHolidays(int year) {
+    public String[] getHolidaysByYear(int year) {
         int index = year - 2006;
         if (index >= 0 && index < holidays.length)
             return holidays[index];
@@ -89,7 +89,7 @@
         else
             theYear = new Integer(year);
 
-        return getHolidays(theYear.intValue());
+        return getHolidaysByYear(theYear.intValue());
     }
 
     @Init

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/java/org/apache/tuscany/sca/test/spec/impl/MyTotalServiceImpl.java Wed Mar 14 17:00:42 2007
@@ -53,8 +53,8 @@
         return myListService.getHolidays();
     }
 
-    public String[] getHolidays(int year) {
-        return myListServiceByYear.getHolidays(year);
+    public String[] getHolidaysByYear(int year) {
+        return myListServiceByYear.getHolidaysByYear(year);
     }
 
     public String getComponentName() {
@@ -65,8 +65,8 @@
         return myService.getContext();
     }
 
-    public Date nextHoliday(Date date) {
-        return myServiceByDate.nextHoliday(date);
+    public Date nextHolidayByDate(Date date) {
+        return myServiceByDate.nextHolidayByDate(date);
     }
 
     public String getLocation() {

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/CompositeTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/CompositeTest.composite?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/CompositeTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/CompositeTest.composite Wed Mar 14 17:00:42 2007
@@ -24,7 +24,6 @@
     <include name="myTotalService" scdlLocation="myTotalService.composite"/>
     <include name="myListService" scdlLocation="myListService.composite"/>
     <include name="mySimpleServiceInRecursive" scdlLocation="mySimpleServiceInRecursive.composite"/>
-    <!-- include name="MyServiceComposite" scdlLocation="MyServiceComposite.composite"/ -->
     <include name="myServiceInRecursive" scdlLocation="myServiceInRecursive.composite"/>
     <include name="mySimpleServiceInRecursive2" scdlLocation="mySimpleServiceInRecursive2.composite"/>
     <include name="MyTotalServiceInRecursive" scdlLocation="myTotalServiceInRecursive.composite"/>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTestCase.java Wed Mar 14 17:00:42 2007
@@ -36,7 +36,7 @@
     }
 
     public void testDefaultService() {
-        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidays(2007)[0]);
+        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2007)[0]);
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTestCase.java Wed Mar 14 17:00:42 2007
@@ -38,13 +38,13 @@
     }
 
     public void testDefaultService() {
-        assertNotSame(myService.nextHoliday(), myService.nextHoliday(new Date()));
-        assertEquals(myService.getHolidays()[0], myService.getHolidays(2007)[0]);
+        assertNotSame(myService.nextHoliday(), myService.nextHolidayByDate(new Date()));
+        assertEquals(myService.getHolidays()[0], myService.getHolidaysByYear(2007)[0]);
 
     }
 
     public void testContext() {
-        //FIXME Looks like this need the 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());

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTestCase.java Wed Mar 14 17:00:42 2007
@@ -44,8 +44,8 @@
     }
 
     public void testDefaultService() {
-        assertEquals(myService.nextHoliday(), myServiceByDate.nextHoliday(new Date()));
-        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidays(2006)[0]);
+        assertEquals(myService.nextHoliday(), myServiceByDate.nextHolidayByDate(new Date()));
+        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2006)[0]);
 
     }
 
@@ -56,12 +56,12 @@
 
     public void testServiceWithOverrideProperty() {
         assertFalse(myNCService.nextHoliday() == myService.nextHoliday());
-        assertEquals(myListServiceFor2006.getHolidays()[0], myListServiceByYear.getHolidays(2006)[0]);
+        assertEquals(myListServiceFor2006.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2006)[0]);
 
     }
 
     public void testContext() {
-        //FIXME Looks like this need the 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());

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTestCase.java Wed Mar 14 17:00:42 2007
@@ -82,7 +82,7 @@
     }
 
     public void testContext() {
-        //FIXME Looks like this need the 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());

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTestCase.java Wed Mar 14 17:00:42 2007
@@ -40,7 +40,7 @@
     }
 
     public void testContext() {
-        //FIXME Looks like this need the 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());

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTestCase.java Wed Mar 14 17:00:42 2007
@@ -50,22 +50,22 @@
 
     public void testServiceFromReferenceNo() {
         System.out.println("nextHolday()" + myService1.nextHoliday());
-        System.out.println("nextHolday(Date)" + myService1.nextHoliday(new Date()));
+        System.out.println("nextHolday(Date)" + myService1.nextHolidayByDate(new Date()));
         System.out.println("myService1.getHolidays()[0]" + myService1.getHolidays()[0]);
-        System.out.println("myService1.getHolidays(2007)[0]" + myService1.getHolidays(2007)[0]);
-        assertNotSame(myService1.nextHoliday(), myService1.nextHoliday(new Date()));
-        assertEquals(myService1.getHolidays()[0], myService1.getHolidays(2007)[0]);
+        System.out.println("myService1.getHolidays(2007)[0]" + myService1.getHolidaysByYear(2007)[0]);
+        assertNotSame(myService1.nextHoliday(), myService1.nextHolidayByDate(new Date()));
+        assertEquals(myService1.getHolidays()[0], myService1.getHolidaysByYear(2007)[0]);
     }
 
     public void testServiceFromReferenceMay() {
-        assertEquals(myService2.getHolidays()[0], myService2.getHolidays(2007)[0]);
-        assertNotSame(myService2.nextHoliday(), myService2.nextHoliday(new Date()));
+        assertEquals(myService2.getHolidays()[0], myService2.getHolidaysByYear(2007)[0]);
+        assertNotSame(myService2.nextHoliday(), myService2.nextHolidayByDate(new Date()));
 
     }
 
     public void testServiceFromReferenceMust() {
-        assertEquals(myService3.getHolidays()[0], myService3.getHolidays(2007)[0]);
-        assertNotSame(myService3.nextHoliday(), myService3.nextHoliday(new Date()));
+        assertEquals(myService3.getHolidays()[0], myService3.getHolidaysByYear(2007)[0]);
+        assertNotSame(myService3.nextHoliday(), myService3.nextHolidayByDate(new Date()));
 
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTestCase.java Wed Mar 14 17:00:42 2007
@@ -51,31 +51,31 @@
     }
 
     public void testServiceFromRecursive() {
-        assertNotSame(myService1.nextHoliday(), myService1.nextHoliday(new Date()));
-        assertEquals(myService1.getHolidays()[0], myService1.getHolidays(2007)[0]);
+        assertNotSame(myService1.nextHoliday(), myService1.nextHolidayByDate(new Date()));
+        assertEquals(myService1.getHolidays()[0], myService1.getHolidaysByYear(2007)[0]);
 
     }
 
     public void testServiceReferenceFromRecursive() {
-        assertEquals(myService2.getHolidays()[0], myService2.getHolidays(2007)[0]);
-        assertNotSame(myService2.nextHoliday(), myService2.nextHoliday(new Date()));
+        assertEquals(myService2.getHolidays()[0], myService2.getHolidaysByYear(2007)[0]);
+        assertNotSame(myService2.nextHoliday(), myService2.nextHolidayByDate(new Date()));
 
     }
 
     public void testServiceReferenceFromRecursiveUseService() {
-        assertNotSame(myService4.nextHoliday(), myService4.nextHoliday(new Date()));
-        assertEquals(myService4.getHolidays()[0], myService4.getHolidays(2007)[0]);
+        assertNotSame(myService4.nextHoliday(), myService4.nextHolidayByDate(new Date()));
+        assertEquals(myService4.getHolidays()[0], myService4.getHolidaysByYear(2007)[0]);
     }
 
     public void testServiceReferenceFromComponent() {
-        assertEquals(myService3.getHolidays()[0], myService3.getHolidays(2007)[0]);
-        assertNotSame(myService3.nextHoliday(), myService3.nextHoliday(new Date()));
+        assertEquals(myService3.getHolidays()[0], myService3.getHolidaysByYear(2007)[0]);
+        assertNotSame(myService3.nextHoliday(), myService3.nextHolidayByDate(new Date()));
 
     }
 
     public void testServiceReferenceFromComponentUseService() {
-        assertNotSame(myService5.nextHoliday(), myService5.nextHoliday(new Date()));
-        assertEquals(myService5.getHolidays()[0], myService5.getHolidays(2007)[0]);
+        assertNotSame(myService5.nextHoliday(), myService5.nextHolidayByDate(new Date()));
+        assertEquals(myService5.getHolidays()[0], myService5.getHolidaysByYear(2007)[0]);
     }
 
     protected void setUp() throws Exception {

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java?view=diff&rev=518390&r1=518389&r2=518390
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTestCase.java Wed Mar 14 17:00:42 2007
@@ -42,13 +42,13 @@
     }
 
     public void testDefaultService() {
-        assertEquals(myService.nextHoliday(), myServiceByDate.nextHoliday(new Date()));
-        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidays(2007)[0]);
+        assertEquals(myService.nextHoliday(), myServiceByDate.nextHolidayByDate(new Date()));
+        assertEquals(myListService.getHolidays()[0], myListServiceByYear.getHolidaysByYear(2007)[0]);
 
     }
 
     public void testContext() {
-        //FIXME Looks like this need the 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());



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org