Author: mgrigorov
Date: Fri Nov 11 08:43:21 2011
New Revision: 1200765
URL: http://svn.apache.org/viewvc?rev=1200765&view=rev
Log:
WICKET-3979 Upgrade Wicket's tests to JUnit4
Modified:
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
Modified:
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java?rev=1200765&r1=1200764&r2=1200765&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
(original)
+++
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/CompoundFieldValueFactoryTest.java
Fri Nov 11 08:43:21 2011
@@ -20,9 +20,10 @@ import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
import org.easymock.MockControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test {@link CompoundFieldValueFactory}
@@ -30,7 +31,7 @@ import org.easymock.MockControl;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class CompoundFieldValueFactoryTest extends TestCase
+public class CompoundFieldValueFactoryTest extends Assert
{
private Integer testField;
@@ -40,8 +41,12 @@ public class CompoundFieldValueFactoryTe
private final IFieldValueFactory[] fact = new IFieldValueFactory[4];
- @Override
- protected void setUp() throws Exception
+ /**
+ *
+ * @throws Exception
+ */
+ @Before
+ public void before() throws Exception
{
CompoundFieldValueFactoryTest.class.getDeclaredField("testField");
@@ -72,6 +77,7 @@ public class CompoundFieldValueFactoryTe
/**
* Test array constructor
*/
+ @Test
public void testArrayConstructor()
{
prepare(2);
@@ -94,6 +100,7 @@ public class CompoundFieldValueFactoryTe
/**
* Test list constructor
*/
+ @Test
public void testListConstructor()
{
prepare(4);
@@ -117,6 +124,7 @@ public class CompoundFieldValueFactoryTe
/**
* Test list constructor
*/
+ @Test
public void testABConstructor()
{
prepare(2);
@@ -148,6 +156,7 @@ public class CompoundFieldValueFactoryTe
/**
* Test list constructor
*/
+ @Test
public void testBreakOnNonNullReturn()
{
prepare(2);
@@ -165,6 +174,7 @@ public class CompoundFieldValueFactoryTe
/**
* Test addFactory()
*/
+ @Test
public void testAdd()
{
prepare(3);
Modified:
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java?rev=1200765&r1=1200764&r2=1200765&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
(original)
+++
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/InjectorTest.java
Fri Nov 11 08:43:21 2011
@@ -18,10 +18,10 @@ package org.apache.wicket.injection;
import java.lang.reflect.Field;
-import junit.framework.TestCase;
-
import org.apache.wicket.injection.util.MockDependency;
import org.apache.wicket.injection.util.TestObject;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests {@link Injector}
@@ -29,7 +29,7 @@ import org.apache.wicket.injection.util.
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class InjectorTest extends TestCase
+public class InjectorTest extends Assert
{
private static MockDependency dependency = new MockDependency("inject");
@@ -62,6 +62,7 @@ public class InjectorTest extends TestCa
/**
* Test injection
*/
+ @Test
public void testInjection()
{
TestObject testObject = new TestObject();
Modified:
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java?rev=1200765&r1=1200764&r2=1200765&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
(original)
+++
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/injection/NoopFieldValueFactoryTest.java
Fri Nov 11 08:43:21 2011
@@ -18,7 +18,9 @@ package org.apache.wicket.injection;
import java.lang.reflect.Field;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test {@link NoopFieldValueFactory}
@@ -26,15 +28,18 @@ import junit.framework.TestCase;
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class NoopFieldValueFactoryTest extends TestCase
+public class NoopFieldValueFactoryTest extends Assert
{
private Field field;
// Not used, but needed for the test. Do not delete.
private Integer testField;
- @Override
- protected void setUp() throws Exception
+ /**
+ * @throws Exception
+ */
+ @Before
+ public void before() throws Exception
{
NoopFieldValueFactoryTest.class.getDeclaredField("testField");
}
@@ -42,6 +47,7 @@ public class NoopFieldValueFactoryTest e
/**
* make sure null is returned
*/
+ @Test
public void test()
{
NoopFieldValueFactory fact = new NoopFieldValueFactory();
Modified:
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java?rev=1200765&r1=1200764&r2=1200765&view=diff
==============================================================================
---
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
(original)
+++
wicket/trunk/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
Fri Nov 11 08:43:21 2011
@@ -18,8 +18,6 @@ package org.apache.wicket.proxy;
import java.lang.reflect.Proxy;
-import junit.framework.TestCase;
-
import org.apache.wicket.proxy.LazyInitProxyFactory.ProxyReplacement;
import org.apache.wicket.proxy.util.ConcreteObject;
import org.apache.wicket.proxy.util.IInterface;
@@ -27,6 +25,8 @@ import org.apache.wicket.proxy.util.IObj
import org.apache.wicket.proxy.util.InterfaceObject;
import org.apache.wicket.proxy.util.ObjectMethodTester;
import org.apache.wicket.util.lang.WicketObjects;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Tests lazy init proxy factory
@@ -34,7 +34,7 @@ import org.apache.wicket.util.lang.Wicke
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class LazyInitProxyFactoryTest extends TestCase
+public class LazyInitProxyFactoryTest extends Assert
{
private static InterfaceObject interfaceObject = new
InterfaceObject("interface");
@@ -73,6 +73,7 @@ public class LazyInitProxyFactoryTest ex
/**
* Tests lazy init proxy to represent interfaces
*/
+ @Test
public void testInterfaceProxy()
{
// test proxy creation for an interface class
@@ -119,6 +120,7 @@ public class LazyInitProxyFactoryTest ex
/**
* Tests lazy init proxy to represent concrete objects
*/
+ @Test
public void testConcreteProxy()
{
ConcreteObject proxy =
(ConcreteObject)LazyInitProxyFactory.createProxy(
@@ -164,6 +166,7 @@ public class LazyInitProxyFactoryTest ex
/**
* Tests lazy init concrete replacement replacement
*/
+ @Test
public void testCGLibInterceptorReplacement()
{
ProxyReplacement ser = new
ProxyReplacement(ConcreteObject.class.getName(),
@@ -176,6 +179,7 @@ public class LazyInitProxyFactoryTest ex
/**
* Tests String beans.
*/
+ @Test
public void testStringProxy()
{
// We special-case String objects to avoid proxying them, as
they're
