Author: julien_viet Date: 2011-08-30 13:09:20 -0400 (Tue, 30 Aug 2011) New Revision: 7254 Modified: components/pc/trunk/pom.xml components/pc/trunk/portlet/pom.xml components/pc/trunk/test/core/pom.xml components/pc/trunk/test/core/src/test/java/org/gatein/pc/controller/StateControllerContextTestCase.java components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/DecoderTestCase.java components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/EncoderTestCase.java Log: fix a few issues with surefire configuration Modified: components/pc/trunk/pom.xml =================================================================== --- components/pc/trunk/pom.xml 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/pom.xml 2011-08-30 17:09:20 UTC (rev 7254) @@ -313,14 +313,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -347,6 +339,11 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.3.1</version> + <configuration> + <excludes> + <exclude>**/*Test.java</exclude> + </excludes> + </configuration> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/portlet/pom.xml 2011-08-30 17:09:20 UTC (rev 7254) @@ -51,16 +51,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>false</skip> - <excludes> - <exclude>**/*Test.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> Modified: components/pc/trunk/test/core/pom.xml =================================================================== --- components/pc/trunk/test/core/pom.xml 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/test/core/pom.xml 2011-08-30 17:09:20 UTC (rev 7254) @@ -202,6 +202,21 @@ </profiles> <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/gatein/pc/test/**/*.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> <!-- Deploy the test jar and its sources --> Modified: components/pc/trunk/test/core/src/test/java/org/gatein/pc/controller/StateControllerContextTestCase.java =================================================================== --- components/pc/trunk/test/core/src/test/java/org/gatein/pc/controller/StateControllerContextTestCase.java 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/test/core/src/test/java/org/gatein/pc/controller/StateControllerContextTestCase.java 2011-08-30 17:09:20 UTC (rev 7254) @@ -22,14 +22,13 @@ ******************************************************************************/ package org.gatein.pc.controller; -import org.jboss.unit.api.pojo.annotations.Test; +import junit.framework.TestCase; import org.gatein.pc.controller.impl.state.StateControllerContextImpl; import org.gatein.pc.controller.state.PortletPageNavigationalState; import org.gatein.pc.controller.state.StateControllerContext; import org.gatein.pc.controller.state.PortletWindowNavigationalState; import org.gatein.pc.controller.state.PortletPageNavigationalStateSerialization; import org.gatein.pc.controller.event.EventControllerContext; -import org.gatein.pc.controller.PortletControllerContext; import org.gatein.pc.api.info.PortletInfo; import org.gatein.pc.api.PortletInvokerException; import org.gatein.pc.api.ParametersStateString; @@ -44,7 +43,6 @@ import org.gatein.common.io.IOTools; import org.gatein.pc.api.Mode; import org.gatein.pc.api.WindowState; -import static org.jboss.unit.api.Assert.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -55,21 +53,18 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -@Test -public class StateControllerContextTestCase +public class StateControllerContextTestCase extends TestCase { /** . */ private StateControllerContextImpl cc = new StateControllerContextImpl(dummyContext); - @Test public void testMarshalling1() { PortletPageNavigationalState pageNS = cc.createPortletPageNavigationalState(true); assertMarshallable(pageNS); } - @Test public void testMarshalling2() { ParametersStateString params = ParametersStateString.create(); Modified: components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/DecoderTestCase.java =================================================================== --- components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/DecoderTestCase.java 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/DecoderTestCase.java 2011-08-30 17:09:20 UTC (rev 7254) @@ -22,32 +22,25 @@ ******************************************************************************/ package org.gatein.pc.test.url; +import junit.framework.TestCase; import org.gatein.common.util.ParameterMap; import java.util.ArrayList; -import static org.jboss.unit.api.Assert.*; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import org.gatein.pc.test.url.CodecBuilder; -import org.gatein.pc.test.url.ParameterDecoder; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class DecoderTestCase +public class DecoderTestCase extends TestCase { Tester tester; - @Create public void setUp() throws Exception { tester = new Tester(); } - @Test public void testNoMeta() { tester.assertActual(0); @@ -65,14 +58,12 @@ tester.checkAndReset(); } - @Test public void testNoMetaCorruption() { tester.parameter("action", "a").assertFailed().checkAndReset(); tester.parameter("action", "1").assertFailed().checkAndReset(); } - @Test public void testOneMeta() { tester.builder.addMetaParameter("m1"); @@ -133,7 +124,6 @@ tester.checkAndReset(); } - @Test public void testOneMetaCorruption() { tester.builder.addMetaParameter("m1"); @@ -148,7 +138,6 @@ tester.parameter("action", "10").parameter("m1", "foo").assertFailed().checkAndReset(); } - @Test public void testTwoMeta() { tester.builder.addMetaParameter("m1"); Modified: components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/EncoderTestCase.java =================================================================== --- components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/EncoderTestCase.java 2011-08-30 14:41:33 UTC (rev 7253) +++ components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/url/EncoderTestCase.java 2011-08-30 17:09:20 UTC (rev 7254) @@ -22,30 +22,23 @@ ******************************************************************************/ package org.gatein.pc.test.url; +import junit.framework.TestCase; import org.gatein.common.util.ParameterMap; -import static org.jboss.unit.api.Assert.*; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import org.gatein.pc.test.url.CodecBuilder; -import org.gatein.pc.test.url.ParameterEncoder; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class EncoderTestCase +public class EncoderTestCase extends TestCase { Tester tester; - @Create public void setUp() throws Exception { tester = new Tester(); } - @Test public void testEncodeNoMeta() { ParameterMap result = tester.encode(); @@ -65,7 +58,6 @@ assertEquals(new String[]{"0"}, result.getValues("action")); } - @Test public void testEncodeOneMeta() { tester.meta("m1"); @@ -97,7 +89,6 @@ assertEquals(new String[]{"bar","foo"}, result.getValues("m1")); } - @Test public void testEncodeTwoMeta() { tester.meta("m1");