4:16 a.m.
Author: bdaw
Date: 2008-01-14 05:16:55 -0500 (Mon, 14 Jan 2008)
New Revision: 9497
Modified:
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java
Log:
run local tests with maven plugin
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-01-14 09:41:39 UTC (rev 9496)
+++ modules/portlet/trunk/test/pom.xml 2008-01-14 10:16:55 UTC (rev 9497)
@@ -195,6 +195,29 @@
<build>
<plugins>
<plugin>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-maven2</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <testsuites>
+ <testsuite>
+ <config>test/local-jboss-unit.xml</config>
+ </testsuite>
+ </testsuites>
+ <reports>
+ <xml>target/tests/reports/xml/local</xml>
+ <html>target/tests/reports/html/local</html>
+ </reports>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
<version>1.13</version>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-01-14 09:41:39 UTC (rev 9496)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-01-14 10:16:55 UTC (rev 9497)
@@ -21,7 +21,6 @@
</target>
<target name="tests.call.all" unless="tests">
- <antcall target="tests.local"/>
<antcall target="tests.jboss"/>
<antcall target="tests.tomcat"/>
</target>
@@ -598,31 +597,4 @@
</target>
- <target name="tests.local">
-
- <taskdef name="jboss-unit"
classname="org.jboss.unit.tooling.ant.JBossUnitTask"
classpath="${plugin_classpath}"/>
-
- <jboss-unit>
-
- <tests
config="${target}/test-classes/test/local-jboss-unit.xml">
-
- </tests>
-
- <reports>
- <xml toDir="${target}/tests/reports/xml/local"/>
- <html toDir="${target}/tests/reports/html/local"/>
- </reports>
-
- <classpath>
- <pathelement location="${target}/classes"/>
- <pathelement location="${target}/test-classes"/>
- <pathelement location="${target}/test-classes/metadata"/>
- <pathelement location="${target}/test-classes/test"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
- </jboss-unit >
-
- </target>
-
</project>
\ No newline at end of file
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -44,7 +44,7 @@
{
try
{
- String xmlFile = "customPortletMode/portlet1.xml";
+ String xmlFile = "metadata/customPortletMode/portlet1.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -74,7 +74,7 @@
try
{
- String xmlFile = "customPortletMode/portlet2.xml";
+ String xmlFile = "metadata/customPortletMode/portlet2.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -117,7 +117,7 @@
try
{
- String xmlFile = "customPortletMode/portlet1-fail.xml";
+ String xmlFile = "metadata/customPortletMode/portlet1-fail.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
fail("portlet 2.0 properties are not allowed");
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -43,7 +43,7 @@
try
{
- String xmlFile = "customWindowState/portlet1.xml";
+ String xmlFile = "metadata/customWindowState/portlet1.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -74,7 +74,7 @@
try
{
- String xmlFile = "customWindowState/portlet2.xml";
+ String xmlFile = "metadata/customWindowState/portlet2.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -48,7 +48,7 @@
try
{
- String xmlFile = "event/portlet-event1.xml";
+ String xmlFile = "metadata/event/portlet-event1.xml";
unmarshall10(xmlFile);
fail();
@@ -65,7 +65,7 @@
try
{
- String xmlFile = "event/portlet-event2.xml";
+ String xmlFile = "metadata/event/portlet-event2.xml";
PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
@@ -125,7 +125,7 @@
try
{
- String xmlFile = "event/portlet-event2-fail.xml";
+ String xmlFile = "metadata/event/portlet-event2-fail.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -43,7 +43,7 @@
{
try
{
- unmarshall10("filter/portlet-filter1.xml");
+ unmarshall10("metadata/filter/portlet-filter1.xml");
// no filters in jsr 168
fail();
}
@@ -58,7 +58,7 @@
{
try
{
- String xmlFile = "filter/portlet-filter2.xml";
+ String xmlFile = "metadata/filter/portlet-filter2.xml";
PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -45,7 +45,7 @@
{
try
{
- PortletApplication10MetaData md =
this.unmarshall10("general/portlet1.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("metadata/general/portlet1.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -62,7 +62,7 @@
{
try
{
- PortletApplication10MetaData md =
this.unmarshall10("general/portlet2.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("metadata/general/portlet2.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
@@ -79,7 +79,7 @@
{
try
{
- PortletApplication20MetaData md =
unmarshall20("general/portlet2-jsr286.xml");
+ PortletApplication20MetaData md =
unmarshall20("metadata/general/portlet2-jsr286.xml");
assertEquals("2.0", md.getVersion());
assertTrue(md instanceof PortletApplication20MetaData);
@@ -118,7 +118,7 @@
{
try
{
- PortletApplication10MetaData md =
unmarshall10("general/portlet-app_1_0.xml");
+ PortletApplication10MetaData md =
unmarshall10("metadata/general/portlet-app_1_0.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
@@ -138,7 +138,7 @@
{
try
{
- PortletApplication10MetaData md =
this.unmarshall10("general/portlet-app_2_0.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("metadata/general/portlet-app_2_0.xml");
assertEquals("2.0", md.getVersion());
assertTrue(md instanceof PortletApplication20MetaData);
}
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -54,7 +54,7 @@
{
try
{
- String xmlFile = "portlet/portlet1.xml";
+ String xmlFile = "metadata/portlet/portlet1.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -222,7 +222,7 @@
{
try
{
- String xmlFile = "portlet/portlet2.xml";
+ String xmlFile = "metadata/portlet/portlet2.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -382,7 +382,7 @@
{
try
{
- String xmlFile = "portlet/portlet2-jsr286.xml";
+ String xmlFile = "metadata/portlet/portlet2-jsr286.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -40,7 +40,7 @@
try
{
- String xmlFile = "renderParameter/portlet2.xml";
+ String xmlFile = "metadata/renderParameter/portlet2.xml";
PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -45,7 +45,7 @@
try
{
- String xmlFile = "security/portlet1.xml";
+ String xmlFile = "metadata/security/portlet1.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -135,7 +135,7 @@
try
{
- String xmlFile = "security/portlet2.xml";
+ String xmlFile = "metadata/security/portlet2.xml";
PortletApplication10MetaData md = unmarshall10( xmlFile);
assertNotNull(md);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java 2008-01-14
09:41:39 UTC (rev 9496)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java 2008-01-14
10:16:55 UTC (rev 9497)
@@ -43,7 +43,7 @@
{
try
{
- String xmlFile = "userAttribute/portlet1.xml";
+ String xmlFile = "metadata/userAttribute/portlet1.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
@@ -73,7 +73,7 @@
{
try
{
- String xmlFile = "userAttribute/portlet2.xml";
+ String xmlFile = "metadata/userAttribute/portlet2.xml";
PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);