svn commit: r641418 - in /incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references: AutoWiredReferenceTestCase.java InnerReferenceTestCase.java

[rfeng]

Author: rfeng
Date: Wed Mar 26 10:25:25 2008
New Revision: 641418

URL: http://svn.apache.org/viewvc?rev=641418&view=rev
Log:
Fix for TUSCANY-2136 (Adjusting the itests)

Modified:
    
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
    
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java

Modified: 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java?rev=641418&r1=641417&r2=641418&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
 Wed Mar 26 10:25:25 2008
@@ -25,7 +25,6 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.osoa.sca.ServiceUnavailableException;
 
 public class AutoWiredReferenceTestCase {
     private static SCADomain domain;
@@ -57,7 +56,7 @@
         assertEquals("BCComponent", acomponent.fooBC());
     }
 
-    @Test(expected = ServiceUnavailableException.class)
+    @Test(expected = NullPointerException.class)
     public void testD1Reference() {
         acomponent.fooD1();
     }

Modified: 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java?rev=641418&r1=641417&r2=641418&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
 Wed Mar 26 10:25:25 2008
@@ -86,13 +86,9 @@
         Assert.assertTrue(components.contains("DComponent1"));
     }    
 
-    @Test
+    @Test(expected = NullPointerException.class)
     public void testRequiredFalseReference() {
-        try {
-            acomponent.getDReference().dFoo();
-        } catch (Exception e) {
-            Assert.assertTrue(true);
-        }
+        acomponent.getDReference().dFoo();
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]