You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/12/03 15:35:24 UTC
svn commit: r722905 - in
/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java:
context/ injection/ util/
Author: mcombellack
Date: Wed Dec 3 06:35:23 2008
New Revision: 722905
URL: http://svn.apache.org/viewvc?rev=722905&view=rev
Log:
Converted unit tests from JUnit 3 to JUnit 4
Modified:
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.sca.implementation.java.context;
-import junit.framework.TestCase;
+import org.junit.Test;
+
/**
@@ -26,8 +27,9 @@
*
* @version $Rev$ $Date$
*/
-public class MultiplicityTestCase extends TestCase {
+public class MultiplicityTestCase {
+ @Test
public void testMultiplicity() throws Exception {
// TODO implement
}
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,17 +18,21 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
+import static org.junit.Assert.assertEquals;
+
import java.lang.reflect.Field;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class FieldInjectorTestCase extends TestCase {
+public class FieldInjectorTestCase {
protected Field protectedField;
+ @Test
public void testIllegalAccess() throws Exception {
FieldInjector<Foo> injector = new FieldInjector<Foo>(protectedField, new SingletonObjectFactory<String>("foo"));
Foo foo = new Foo();
@@ -37,9 +41,8 @@
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
protectedField = Foo.class.getDeclaredField("hidden");
}
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,20 +18,23 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
-import java.lang.reflect.Method;
+import static org.junit.Assert.fail;
-import junit.framework.TestCase;
+import java.lang.reflect.Method;
import org.apache.tuscany.sca.implementation.java.invocation.EventInvocationException;
import org.apache.tuscany.sca.implementation.java.invocation.MethodEventInvoker;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class MethodEventInvokerTestCase extends TestCase {
+public class MethodEventInvokerTestCase {
private Method privateMethod;
private Method exceptionMethod;
+ @Test
public void testIllegalAccess() throws Exception {
MethodEventInvoker<MethodEventInvokerTestCase.Foo> injector = new MethodEventInvoker<Foo>(privateMethod);
try {
@@ -42,6 +45,7 @@
}
}
+ @Test
public void testException() throws Exception {
MethodEventInvoker<MethodEventInvokerTestCase.Foo> injector = new MethodEventInvoker<Foo>(exceptionMethod);
try {
@@ -52,9 +56,8 @@
}
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
privateMethod = MethodEventInvokerTestCase.Foo.class.getDeclaredMethod("hidden");
exceptionMethod = MethodEventInvokerTestCase.Foo.class.getDeclaredMethod("exception");
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,21 +18,24 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
-import java.lang.reflect.Method;
+import static org.junit.Assert.fail;
-import junit.framework.TestCase;
+import java.lang.reflect.Method;
import org.apache.tuscany.sca.core.factory.ObjectCreationException;
import org.apache.tuscany.sca.core.factory.ObjectFactory;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class MethodInjectorTestCase extends TestCase {
+public class MethodInjectorTestCase {
private Method fooMethod;
private Method privateMethod;
private Method exceptionMethod;
+ @Test
public void testIllegalArgument() throws Exception {
ObjectFactory<Object> factory = new SingletonObjectFactory<Object>(new Object());
MethodInjector<Foo> injector = new MethodInjector<Foo>(fooMethod, factory);
@@ -44,6 +47,7 @@
}
}
+ @Test
public void testException() throws Exception {
ObjectFactory<Object> factory = new SingletonObjectFactory<Object>("foo");
MethodInjector<Foo> injector = new MethodInjector<Foo>(exceptionMethod, factory);
@@ -55,9 +59,8 @@
}
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
fooMethod = Foo.class.getMethod("foo", String.class);
privateMethod = Foo.class.getDeclaredMethod("hidden", String.class);
exceptionMethod = Foo.class.getDeclaredMethod("exception", String.class);
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,13 +18,16 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class RequestContextObjectFactoryTestCase extends TestCase {
+public class RequestContextObjectFactoryTestCase {
+ @Test
public void testInstanceCreate() {
RequestContextObjectFactory factory = new RequestContextObjectFactory(null);
assertNotNull(factory.getInstance());
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,13 +18,16 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class SingletonObjectFactoryTestCase extends TestCase {
+public class SingletonObjectFactoryTestCase {
+ @Test
public void testSingleton() throws Exception {
Object o = new Object();
SingletonObjectFactory<Object> factory = new SingletonObjectFactory<Object>(o);
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,21 +18,25 @@
*/
package org.apache.tuscany.sca.implementation.java.injection;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.core.factory.ObjectFactory;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class TestObjectFactoryTestCase extends TestCase {
+public class TestObjectFactoryTestCase {
private Constructor<Foo> ctor;
+ @Test
public void testConstructorInjection() throws Exception {
List<ObjectFactory> initializers = new ArrayList<ObjectFactory>();
initializers.add(new SingletonObjectFactory<String>("foo"));
@@ -45,6 +49,7 @@
* Verifies null parameters can be passed to a constructor. This is valid when a reference is optional during
* constructor injection
*/
+ @Test
public void testConstructorInjectionOptionalParam() throws Exception {
List<ObjectFactory> initializers = new ArrayList<ObjectFactory>();
initializers.add(null);
@@ -53,6 +58,7 @@
assertNull(foo.foo);
}
+ @Test
public void testConstructorInitializerInjection() throws Exception {
TestObjectFactory<Foo> factory = new TestObjectFactory<Foo>(ctor);
factory.setInitializerFactory(0, new SingletonObjectFactory<String>("foo"));
@@ -60,9 +66,8 @@
assertEquals("foo", foo.foo);
}
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
ctor = Foo.class.getConstructor(String.class);
}
Modified: tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java?rev=722905&r1=722904&r2=722905&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java Wed Dec 3 06:35:23 2008
@@ -18,6 +18,9 @@
*/
package org.apache.tuscany.sca.implementation.java.util;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -25,15 +28,14 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class JavaIntrospectionHelperTestCase extends TestCase {
+public class JavaIntrospectionHelperTestCase {
private List testNoGenericsList;
private List<String> testList;
@@ -41,29 +43,25 @@
private Entry[] testArray;
private String[] testStringArray;
- public JavaIntrospectionHelperTestCase() {
- super();
- }
-
- public JavaIntrospectionHelperTestCase(String arg0) {
- super(arg0);
- }
-
+ @Test
public void testBean1AllPublicProtectedFields() throws Exception {
Set<Field> beanFields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(Bean1.class, true);
assertEquals(4, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS
}
+ @Test
public void testGetSuperAllMethods() throws Exception {
Set<Method> superBeanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(SuperBean.class, true);
assertEquals(SuperBean.ALL_SUPER_METHODS, superBeanMethods.size());
}
+ @Test
public void testGetBean1AllMethods() throws Exception {
Set<Method> beanMethods = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
assertEquals(Bean1.ALL_BEAN1_METHODS, beanMethods.size());
}
+ @Test
public void testOverrideMethod() throws Exception {
Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
boolean invoked = false;
@@ -78,6 +76,7 @@
}
}
+ @Test
public void testNoOverrideMethod() throws Exception {
Set<Method> beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true);
boolean found = false;
@@ -91,6 +90,7 @@
}
}
+ @Test
public void testDefaultConstructor() throws Exception {
Constructor ctr = JavaIntrospectionHelper.getDefaultConstructor(Bean2.class);
assertEquals(ctr, Bean2.class.getConstructor());
@@ -98,6 +98,7 @@
}
+ @Test
public void testGetAllInterfaces() {
Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(Z.class);
assertEquals(2, interfaces.size());
@@ -106,11 +107,13 @@
}
+ @Test
public void testGetAllInterfacesObject() {
Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(Object.class);
assertEquals(0, interfaces.size());
}
+ @Test
public void testGetAllInterfacesNoInterfaces() {
Set<Class> interfaces = JavaIntrospectionHelper.getAllInterfaces(NoInterface.class);
assertEquals(0, interfaces.size());
@@ -119,6 +122,7 @@
/**
* Tests generics introspection capabilities
*/
+ @Test
public void testGenerics() throws Exception {
List classes = JavaIntrospectionHelper.getGenerics(getClass().getDeclaredField("testList").getGenericType());