[seam-commits] Seam SVN: r12784 - in modules: faces/trunk/impl/src/test/java/org/jboss/seam/faces/context and 8 other directories.

Author: lincolnthree Date: 2010-05-24 16:17:59 -0400 (Mon, 24 May 2010) New Revision: 12784 Added: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java Removed: modules/international/trunk/api/src/test/java/org/jboss/seam/international/status/builder/ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/FacesAnnotationsAdapterExtensionTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/FacesContextProducerTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java modules/faces/trunk/pom.xml modules/international/trunk/pom.xml Log: Updated Arquillian Version -- i18n module still not building due to integration bugs between XML module and Arquillian. Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/FacesAnnotationsAdapterExtensionTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/FacesAnnotationsAdapterExtensionTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/FacesAnnotationsAdapterExtensionTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.context; import static org.junit.Assert.assertTrue; @@ -26,7 +26,7 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Test; @@ -42,7 +42,7 @@ @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClasses(ImproperlyAnnotatedBean.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(ImproperlyAnnotatedBean.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Test Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.context.conversation; import static org.junit.Assert.assertEquals; @@ -33,7 +33,7 @@ import org.jboss.seam.faces.MockConversation; import org.jboss.seam.faces.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,7 +48,7 @@ @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClasses(ConversationBoundaryInterceptor.class, ConversationalBean.class, MockLogger.class, MockConversation.class).addManifestResource(ConversationBoundaryInterceptorTest.class.getPackage().getName().replaceAll("\\.", "/") + "/ConversationBoundaryInterceptorTest-beans.xml", ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(ConversationBoundaryInterceptor.class, ConversationalBean.class, MockLogger.class, MockConversation.class).addManifestResource(ConversationBoundaryInterceptorTest.class.getPackage().getName().replaceAll("\\.", "/") + "/ConversationBoundaryInterceptorTest-beans.xml", ArchivePaths.create("beans.xml")); } @Inject Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/ExternalContextProducerTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.environment; import javax.enterprise.context.ContextNotActiveException; @@ -33,7 +33,7 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Test; @@ -51,7 +51,7 @@ @Deployment public static Archive<?> createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addClass(ExternalContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addClass(ExternalContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/FacesContextProducerTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/FacesContextProducerTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/environment/FacesContextProducerTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.environment; import javax.enterprise.context.ContextNotActiveException; @@ -33,7 +33,7 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.junit.Test; @@ -41,8 +41,7 @@ /** * Verify that the FacesContextProducer produces the same FacesContext as - * returned by FacesContext#getCurrentInstance() and by the CDI producer - * method. + * returned by FacesContext#getCurrentInstance() and by the CDI producer method. * * @author Dan Allen */ @@ -52,7 +51,7 @@ @Deployment public static Archive<?> createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClass(FacesContextProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventBridgeTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.event; import java.util.ArrayList; @@ -32,7 +32,7 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.faces.MockLogger; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.jboss.test.faces.mock.context.MockFacesContext; @@ -44,7 +44,7 @@ /** * * @author Nicklas Karlsson - * + * */ @RunWith(Arquillian.class) public class PhaseEventBridgeTest @@ -66,7 +66,7 @@ @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClasses(MockPhaseEventObserver.class, PhaseEventBridge.class, BeanManagerAware.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockPhaseEventObserver.class, PhaseEventBridge.class, BeanManagerAware.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject @@ -88,7 +88,7 @@ fireBeforePhases(ALL_PHASES); } - private void fireBeforePhases(List<PhaseId> phases) + private void fireBeforePhases(final List<PhaseId> phases) { for (PhaseId phaseId : phases) { @@ -96,7 +96,7 @@ } } - private void fireBeforePhase(PhaseId phaseId) + private void fireBeforePhase(final PhaseId phaseId) { phaseEventBridge.beforePhase(new PhaseEvent(facesContext, phaseId, lifecycle)); } @@ -106,7 +106,7 @@ fireAfterPhases(ALL_PHASES); } - private void fireAfterPhases(List<PhaseId> phases) + private void fireAfterPhases(final List<PhaseId> phases) { for (PhaseId phaseId : phases) { @@ -114,7 +114,7 @@ } } - private void fireAfterPhase(PhaseId phaseId) + private void fireAfterPhase(final PhaseId phaseId) { phaseEventBridge.afterPhase(new PhaseEvent(facesContext, phaseId, lifecycle)); } Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -48,7 +48,7 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; import org.jboss.test.faces.mock.application.MockApplication; @@ -69,7 +69,7 @@ @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class).addClasses(SystemEventObserver.class, SystemEventBridge.class, BeanManagerAware.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(SystemEventObserver.class, SystemEventBridge.class, BeanManagerAware.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject @@ -156,7 +156,7 @@ { fireAndAssert("11", new PostValidateEvent(component)); } - + @Test public void testObservePostAddToView() { @@ -167,19 +167,19 @@ public void testObservePostAddToViewComponent() { fireAndAssert("13", new PostAddToViewEvent(component)); - } - + } + @Test public void testObservePostConstructViewMap() { fireAndAssert("14", new PostConstructViewMapEvent(uiViewRoot)); } - + @Test public void testObservePostConstructSpecificViewMap() { fireAndAssert("14a", new PostConstructViewMapEvent(uiViewRoot)); - } + } @Test public void testObservePostRestoreState() @@ -191,20 +191,20 @@ public void testObservePostRestoreStateComponent() { fireAndAssert("16", new PostRestoreStateEvent(component)); - } - + } + @Test public void testObservePreDestroyViewMap() { fireAndAssert("17", new PreDestroyViewMapEvent(uiViewRoot)); - } - + } + @Test public void testObservePreDestroySpecificViewMap() { fireAndAssert("17a", new PreDestroyViewMapEvent(uiViewRoot)); - } - + } + @Test public void testObservePreRemoveFromView() { @@ -215,8 +215,8 @@ public void testObservePreRemoveFromViewComponent() { fireAndAssert("19", new PreRemoveFromViewEvent(component)); - } - + } + @Test public void testObservePreRenderComponent() { @@ -227,25 +227,25 @@ public void testObservePreRenderComponentComponent() { fireAndAssert("21", new PreRenderComponentEvent(component)); - } - + } + @Test public void testObservePreRenderView() { fireAndAssert("22", new PreRenderViewEvent(uiViewRoot)); - } - + } + @Test public void testObservePreRenderSpecificView() { fireAndAssert("23", new PreRenderViewEvent(uiViewRoot)); - } - - - private void fireAndAssert(String caseId, SystemEvent... events) + } + + private void fireAndAssert(final String caseId, final SystemEvent... events) { observer.reset(); - for (SystemEvent e : events) { + for (SystemEvent e : events) + { listener.processEvent(e); } observer.assertObservations(caseId, events); Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/faces/trunk/pom.xml 2010-05-24 20:17:59 UTC (rev 12784) @@ -31,15 +31,17 @@ <properties> <seam.i18n.version>3.0.0-SNAPSHOT</seam.i18n.version> - <arquillian.version>1.0.0.Alpha1</arquillian.version> + <weldx.version>1.0.0.Alpha2</weldx.version> + + <arquillian.version>1.0.0.Alpha2</arquillian.version> + <jsfunit.version>1.2.0.Final</jsfunit.version> <jsfmock.version>1.0.0</jsfmock.version> - <jsfunit.version>1.2.0.Final</jsfunit.version> - <weldx.version>1.0.0-SNAPSHOT</weldx.version> <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-Final</weld.core.version> <junit.version>4.8.1</junit.version> + <slf4j.version>1.5.10</slf4j.version> <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> - <slf4j.version>1.5.10</slf4j.version> </properties> <dependencyManagement> @@ -54,6 +56,14 @@ </dependencies> </dependencyManagement> + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + </repositories> + <dependencies> <dependency> <groupId>org.jboss.seam.international</groupId> @@ -116,6 +126,19 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld.core.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.jboss.test-jsf</groupId> <artifactId>jsf-mock</artifactId> <version>${jsfmock.version}</version> @@ -247,10 +270,8 @@ </developers> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/t... - </connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/f... - </developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/t... </connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/f... </developerConnection> <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url> </scm> </project> Copied: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder (from rev 12781, modules/international/trunk/api/src/test/java/org/jboss/seam/international/status/builder) Deleted: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java =================================================================== --- modules/international/trunk/api/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java 2010-05-24 15:43:41 UTC (rev 12781) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.international.status.builder; - -import static org.junit.Assert.assertEquals; - -import javax.inject.Inject; - -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.status.Bundles; -import org.jboss.seam.international.status.MessageFactory; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - * - */ -(a)RunWith(Arquillian.class) -public class TemplateMessageTest -{ - @Deployment - public static Archive<?> createTestArchive() - { - return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); - } - - @Inject - MessageFactory factory; - - @Test - public void testParameterizedTemplate() throws Exception - { - String expected = "There are 5 cars, and they are all green; green is the best color."; - TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green"); - assertEquals(expected, builder.build().getText()); - } - - @Test - public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception - { - String expected = "There are 5 cars, and they are all {1}; {1} is the best color."; - TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5); - assertEquals(expected, builder.build().getText()); - } - - @Test - public void testPlainTextTemplate() throws Exception - { - String expected = "There are 5 cars, and they are all green; green is the best color."; - TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color."); - assertEquals(expected, builder.build().getText()); - } - - @Test - public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception - { - String expected = "There are 5 cars, and they are all green; green is the best color."; - TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6); - assertEquals(expected, builder.build().getText()); - } -} Copied: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java (from rev 12783, modules/international/trunk/api/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java) =================================================================== --- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java (rev 0) +++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/status/builder/TemplateMessageTest.java 2010-05-24 20:17:59 UTC (rev 12784) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.international.status.builder; + +import static org.junit.Assert.assertEquals; + +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.international.status.Bundles; +import org.jboss.seam.international.status.MessageFactory; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + * + */ +(a)RunWith(Arquillian.class) +public class TemplateMessageTest +{ + @Deployment + public static Archive<?> createTestArchive() + { + return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + } + + @Inject + MessageFactory factory; + + @Test + public void testParameterizedTemplate() throws Exception + { + String expected = "There are 5 cars, and they are all green; green is the best color."; + TemplateMessage builder = factory.info("There are {0} cars, and they are all {1}; {1} is the best color.", 5, "green"); + assertEquals(expected, builder.build().getText()); + } + + @Test + public void testParameterizedTemplateInsertsParamNumbersIfNotEnoughParamValues() throws Exception + { + String expected = "There are 5 cars, and they are all {1}; {1} is the best color."; + TemplateMessage builder = factory.warn("There are {0} cars, and they are all {1}; {1} is the best color.", 5); + assertEquals(expected, builder.build().getText()); + } + + @Test + public void testPlainTextTemplate() throws Exception + { + String expected = "There are 5 cars, and they are all green; green is the best color."; + TemplateMessage builder = factory.error("There are 5 cars, and they are all green; green is the best color."); + assertEquals(expected, builder.build().getText()); + } + + @Test + public void testPlainTextTemplateWithParamsIsUnmodified() throws Exception + { + String expected = "There are 5 cars, and they are all green; green is the best color."; + TemplateMessage builder = factory.fatal("There are 5 cars, and they are all green; green is the best color.", "blue", "red", 6); + assertEquals(expected, builder.build().getText()); + } +} Modified: modules/international/trunk/pom.xml =================================================================== --- modules/international/trunk/pom.xml 2010-05-24 16:00:44 UTC (rev 12783) +++ modules/international/trunk/pom.xml 2010-05-24 20:17:59 UTC (rev 12784) @@ -1,230 +1,253 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>9</version> - </parent> + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> + </parent> - <artifactId>seam-international-parent</artifactId> - <groupId>org.jboss.seam.international</groupId> - <version>3.0.0-SNAPSHOT</version> + <artifactId>seam-international-parent</artifactId> + <groupId>org.jboss.seam.international</groupId> + <version>3.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Seam International Module Parent POM</name> + <packaging>pom</packaging> + <name>Seam International Module Parent POM</name> - <description>The Parent for Seam International Module</description> - <url>http://www.seamframework.org</url> + <description>The Parent for Seam International Module</description> + <url>http://www.seamframework.org</url> - <modules> - <module>api</module> - <module>impl</module> - <!--module>docs</module--> - <!--module>examples/??</module--> - </modules> + <modules> + <module>api</module> + <module>impl</module> + <!--module>docs</module--> + <!--module>examples/??</module--> + </modules> - <properties> - <arquillian.version>1.0.0-SNAPSHOT</arquillian.version> - <seam.xml.version>3.0.0-SNAPSHOT</seam.xml.version> - <weld.extensions.version>1.0.0.Alpha2</weld.extensions.version> - <weld.api.version>1.0-SP1</weld.api.version> - <junit.version>4.8.1</junit.version> - <slf4j.version>1.5.10</slf4j.version> - <joda-time.version>1.6</joda-time.version> - <pretty-time.version>1.0.6</pretty-time.version> - <commons-lang.version>2.5</commons-lang.version> - <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> - <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> - </properties> + <properties> + <seam.xml.version>3.0.0-SNAPSHOT</seam.xml.version> + <weldx.version>1.0.0.Alpha2</weldx.version> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> + <arquillian.version>1.0.0.Alpha2</arquillian.version> + <weld.api.version>1.0-SP1</weld.api.version> + <weld.core.version>1.0.1-Final</weld.core.version> + <junit.version>4.8.1</junit.version> + <slf4j.version>1.5.10</slf4j.version> + <joda-time.version>1.6</joda-time.version> + <pretty-time.version>1.0.6</pretty-time.version> + <commons-lang.version>2.5</commons-lang.version> + <emma.maven.plugin.version>1.0-alpha-2</emma.maven.plugin.version> + <emma4it.maven.plugin.version>1.3</emma4it.maven.plugin.version> + </properties> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Environment Dependencies --> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions</artifactId> - <version>${weld.extensions.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>${joda-time.version}</version> - </dependency> - <dependency> - <groupId>com.ocpsoft</groupId> - <artifactId>ocpsoft-pretty-time</artifactId> - <version>${pretty-time.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${commons-lang.version}</version> - </dependency> + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + </repositories> - <!-- Test Dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-junit</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-weld-embedded</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-bean-config</artifactId> - <version>${seam.xml.version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> - <developers> - <developer> - <name>Lincoln Baxter, III</name> - <email&gt;lincolnbaxter(a)gmail.com&lt;/email&gt; - <url>http://ocpsoft.com</url> - <organization>JBoss, by Red Hat</organization> - <organizationUrl>http://jboss.org</organizationUrl> - <timezone>EST</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - <developer> - <name>Ken Finnigan</name> - <timezone>GMT</timezone> - <roles> - <role>Project Lead</role> - </roles> - </developer> - </developers> + <!-- Environment Dependencies --> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <version>${weldx.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>${joda-time.version}</version> + </dependency> + <dependency> + <groupId>com.ocpsoft</groupId> + <artifactId>ocpsoft-pretty-time</artifactId> + <version>${pretty-time.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/interna... - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/i... - <url>http://fisheye.jboss.org/browse/Seam/modules/international/trunk&l... - </scm> + <!-- Test Dependencies --> + <dependency> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-bean-config</artifactId> + <version>${seam.xml.version}</version> + <scope>test</scope> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld.core.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + </dependencies> - <profiles> - <profile> - <id>code-coverage</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>emma-maven-plugin</artifactId> - <version>${emma.maven.plugin.version}</version> - <inherited>true</inherited> - <executions> - <execution> - <id>instrumentation</id> - <phase>process-classes</phase> - <goals> - <goal>instrument</goal> - </goals> - <configuration> - <verbose>true</verbose> - </configuration> - </execution> - <execution> - <id>cleaning</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <forkMode>once</forkMode> - <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> - </configuration> - </plugin> + <profiles> + <profile> + <id>code-coverage</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <version>${emma.maven.plugin.version}</version> + <inherited>true</inherited> + <executions> + <execution> + <id>instrumentation</id> + <phase>process-classes</phase> + <goals> + <goal>instrument</goal> + </goals> + <configuration> + <verbose>true</verbose> + </configuration> + </execution> + <execution> + <id>cleaning</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <version>${emma4it.maven.plugin.version}</version> - <executions> - <execution> - <id>report</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${project.build.sourceDirectory}</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <forkMode>once</forkMode> + <classesDirectory>${project.build.directory}/generated-classes/emma/classes</classesDirectory> + </configuration> + </plugin> + + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + <version>${emma4it.maven.plugin.version}</version> + <executions> + <execution> + <id>report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <sourceSets> + <sourceSet> + <directory>${project.build.sourceDirectory}</directory> + </sourceSet> + </sourceSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> + + <developers> + <developer> + <name>Lincoln Baxter, III</name> + <email&gt;lincolnbaxter(a)gmail.com&lt;/email&gt; + <url>http://ocpsoft.com</url> + <organization>JBoss, by Red Hat</organization> + <organizationUrl>http://jboss.org</organizationUrl> + <timezone>EST</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + <developer> + <name>Ken Finnigan</name> + <timezone>GMT</timezone> + <roles> + <role>Project Lead</role> + </roles> + </developer> + </developers> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/interna... + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/i... + <url>http://fisheye.jboss.org/browse/Seam/modules/international/trunk&l... + </scm> </project>