[picocontainer-dev] RE: [picocontainer-scm] [4129] java/2.x/trunk/pico/container/src/test/org/picocontainer: Continue conversion of unit tests to JUnit 4/JMock 2.

Dumb question -- so can Maven simultaneously support JUnit 3 AND Junit 4 Test Cases?

										-Mike

--------------------------------------------------------

From: mauro-yCVjj/[email protected] [mailto:mauro-yCVjj/[email protected]] 
Sent: Wednesday, January 02, 2008 3:57 AM
To: scm-qxt/[email protected]
Subject: [picocontainer-scm] [4129] java/2.x/trunk/pico/container/src/test/org/picocontainer: Continue conversion of unit tests to JUnit 4/JMock 2.

Revision
4129
Author
mauro
Date
2008-01-02 05:57:25 -0600 (Wed, 02 Jan 2008)
Log Message
Continue conversion of unit tests to JUnit 4/JMock 2.
Modified Paths
• java/2.x/trunk/pico/container/src/test/org/picocontainer/CharacteristicsTestCase.java
• java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java
• java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoVisitorTestCase.java
Diff
Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/CharacteristicsTestCase.java (4128 => 4129)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/CharacteristicsTestCase.java	2007-12-31 13:03:42 UTC (rev 4128)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/CharacteristicsTestCase.java	2008-01-02 11:57:25 UTC (rev 4129)
@@ -1,19 +1,15 @@
 package org.picocontainer;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
-public class CharacteristicsTestCase extends TestCase {
+public class CharacteristicsTestCase  {
 
-    @Test public void testCharacteristicsAreImmutable() {
-        String b4 = Characteristics.CDI.toString();
-        try {
-            Characteristics.CDI.remove("injection");
-            fail();
-        } catch (UnsupportedOperationException e) {
-            // expected
-        }
+    @Test(expected=UnsupportedOperationException.class)    
+    public void testCharacteristicsAreImmutable() {
+        assertNotNull(Characteristics.CDI.toString());
+        Characteristics.CDI.remove("injection");
     }
 
 }
Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java (4128 => 4129)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java	2007-12-31 13:03:42 UTC (rev 4128)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java	2008-01-02 11:57:25 UTC (rev 4129)
@@ -9,6 +9,8 @@
  *****************************************************************************/
 package org.picocontainer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static org.picocontainer.behaviors.Behaviors.caching;
 import static org.picocontainer.behaviors.Behaviors.implementationHiding;
 import static org.picocontainer.behaviors.Behaviors.synchronizing;
@@ -19,8 +21,7 @@
 import java.util.HashSet;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
 import org.junit.Test;
 import org.picocontainer.behaviors.ImplementationHiding;
 import org.picocontainer.containers.EmptyPicoContainer;
@@ -35,11 +36,12 @@
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
-public class PicoBuilderTestCase extends TestCase {
+public class PicoBuilderTestCase {
 
     private XStream xs;
 
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         xs = new XStream();
         xs.alias("PICO", DefaultPicoContainer.class);
         xs.registerConverter(new Converter() {
Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoVisitorTestCase.java (4128 => 4129)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoVisitorTestCase.java	2007-12-31 13:03:42 UTC (rev 4128)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoVisitorTestCase.java	2008-01-02 11:57:25 UTC (rev 4129)
@@ -7,9 +7,18 @@
  *****************************************************************************/
 package org.picocontainer;
 
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.Sequence;
+import org.jmock.integration.junit4.JMock;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.picocontainer.tck.MockFactory;
 import org.picocontainer.visitors.AbstractPicoVisitor;
 import org.picocontainer.visitors.VerifyingVisitor;
 
@@ -17,10 +26,13 @@
 /**
  * Test general PicoVisitor behaviour.
  * @author Jörg Schaible
+ * @author Mauro Talevi
  */
-public class PicoVisitorTestCase
-        extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class PicoVisitorTestCase {
 
+	private Mockery mockery = MockFactory.mockeryWithCountingNamingScheme();
+	
     @Test public void testVisitorThatMustBeInvokedUsingTraverse() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         try {
@@ -55,13 +67,15 @@
     }
 
     @Test public void testThrownRuntimeExceptionIsUnwrapped() {
-        Mock mockPico = mock(PicoContainer.class);
-        PicoVisitor visitor = new VerifyingVisitor();
-        Error exception = new Error("junit");
-        mockPico.expects(once()).method("accept").with(same(visitor)).will(
-                throwException(new PicoCompositionException("message", exception)));
+    	final PicoContainer pico = mockery.mock(PicoContainer.class);
+        final PicoVisitor visitor = new VerifyingVisitor();
+        final Error exception = new Error("junit");
+        mockery.checking(new Expectations() {{
+            one(pico).accept(with(same(visitor)));
+            will(throwException(new PicoCompositionException("message", exception)));
+        }});
         try {
-            visitor.traverse(mockPico.proxy());
+            visitor.traverse(pico);
             fail("PicoCompositionException expected");
         } catch (RuntimeException e) {
             assertEquals("message", e.getMessage());
@@ -70,14 +84,18 @@
     }
 
     @Test public void testThrownErrorIsUnwrapped() {
-        Mock mockPico = mock(PicoContainer.class);
-        PicoVisitor visitor = new VerifyingVisitor();
-        Error error = new InternalError("junit");
-        mockPico.expects(once()).method("accept").with(same(visitor)).id("1");
-        mockPico.expects(once()).method("accept").with(same(visitor)).after("1").will(throwException(error));
-        visitor.traverse(mockPico.proxy());
+    	final PicoContainer pico = mockery.mock(PicoContainer.class);
+        final PicoVisitor visitor = new VerifyingVisitor();
+        final Error error = new InternalError("junit");
+        final Sequence sequence = mockery.sequence("accepting");
+        mockery.checking(new Expectations() {{
+            one(pico).accept(with(same(visitor))); inSequence(sequence);
+            one(pico).accept(with(same(visitor))); inSequence(sequence);
+            will(throwException(error));
+        }});
+        visitor.traverse(pico);
         try {
-            visitor.traverse(mockPico.proxy());
+            visitor.traverse(pico);
             fail("UndeclaredThrowableException expected");
         } catch(InternalError e) {
             assertEquals("junit", e.getMessage());

________________________________________
To unsubscribe from this list please visit: 
http://xircles.codehaus.org/manage_email 



---------------------------------------------------------------------
To unsubscribe from this list please visit:

    http://xircles.codehaus.org/manage_email