11:57 a.m.
Author: manaRH
Date: 2012-05-26 12:57:58 -0400 (Sat, 26 May 2012)
New Revision: 14748
Modified:
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/testng.xml
branches/community/Seam_2_3/pom.xml
Log:
JBSEAM-4911 changed order in launching tests - move up PhaseListenerTest tests
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-25 15:37:17 UTC (rev 14747)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-05-26 16:57:58 UTC (rev 14748)
@@ -34,6 +34,15 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+
<suiteXmlFile>${basedir}/src/test/java/org/jboss/seam/test/unit/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -308,7 +317,6 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
</dependency>
<dependency>
Modified:
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
===================================================================
---
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-05-25
15:37:17 UTC (rev 14747)
+++
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-05-26
16:57:58 UTC (rev 14748)
@@ -41,6 +41,7 @@
public class PhaseListenerTest
{
+
private void installComponents(Context appContext)
{
Init init = new Init();
@@ -76,7 +77,7 @@
return facesContext;
}
- //@Test
+ @Test
public void testSeamPhaseListener()
{
MockFacesContext facesContext = createFacesContext();
@@ -138,7 +139,7 @@
}
@SuppressWarnings("serial")
- //@Test
+ @Test
public void testSeamPhaseListenerLongRunning()
{
MockFacesContext facesContext = createFacesContext();
@@ -210,7 +211,7 @@
return facesContext.getViewRoot().getViewMap();
}
- //@Test
+ @Test
public void testSeamPhaseListenerNewLongRunning()
{
MockFacesContext facesContext = createFacesContext();
@@ -268,7 +269,7 @@
assert !Contexts.isConversationContextActive();
}
- //@Test
+ @Test
public void testSeamPhaseListenerRedirect()
{
MockFacesContext facesContext = createFacesContext();
@@ -309,7 +310,8 @@
assert !Contexts.isApplicationContextActive();
assert !Contexts.isConversationContextActive();
}
- //@Test
+
+ @Test
public void testSeamPhaseListenerNonFacesRequest()
{
MockFacesContext facesContext = createFacesContext();
Modified:
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/testng.xml
===================================================================
---
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/testng.xml 2012-05-25
15:37:17 UTC (rev 14747)
+++
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/testng.xml 2012-05-26
16:57:58 UTC (rev 14748)
@@ -28,6 +28,12 @@
</classes>
</test>
+ <test name="Seam Unit Tests JSF integration">
+ <classes>
+ <class name="org.jboss.seam.test.unit.PhaseListenerTest"/>
+ </classes>
+ </test>
+
<test name="Seam Unit Tests Pages dot xml">
<classes>
<class name="org.jboss.seam.test.unit.PageActionsTest" />
@@ -36,12 +42,6 @@
</classes>
</test>
- <test name="Seam Unit Tests JSF integration">
- <classes>
- <class name="org.jboss.seam.test.unit.PhaseListenerTest"/>
- </classes>
- </test>
-
<test name="Seam Unit Tests Password Hash">
<classes>
<class name="org.jboss.seam.test.unit.PasswordHashTest"/>
Modified: branches/community/Seam_2_3/pom.xml
===================================================================
--- branches/community/Seam_2_3/pom.xml 2012-05-25 15:37:17 UTC (rev 14747)
+++ branches/community/Seam_2_3/pom.xml 2012-05-26 16:57:58 UTC (rev 14748)
@@ -47,7 +47,7 @@
<version.arquillian_core>1.0.0.Final</version.arquillian_core>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.1.1</version.drools>
- <version.testng>5.10</version.testng>
+ <version.testng>5.14.10</version.testng>
<version.resteasy>2.0.1.GA</version.resteasy>
<version.jbossembedded>beta3.SP15</version.jbossembedded>
<version.jbossas7>7.1.1.Final</version.jbossas7>
@@ -339,7 +339,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.testng}</version>
- <classifier>jdk15</classifier>
</dependency>
<dependency>