[jboss-cvs] JBossAS SVN: r103824 - in trunk/system: src and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 12 08:44:59 EDT 2010
Author: emuckenhuber
Date: 2010-04-12 08:44:59 -0400 (Mon, 12 Apr 2010)
New Revision: 103824
Added:
trunk/system/src/test/
trunk/system/src/test/java/
trunk/system/src/test/java/org/
trunk/system/src/test/java/readme.html
Removed:
trunk/system/src/tests/
Modified:
trunk/system/pom.xml
trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/ComponentMapperUnitTestCase.java
trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockServerConfig.java
Log:
mv src/tests to src/test
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2010-04-12 12:35:55 UTC (rev 103823)
+++ trunk/system/pom.xml 2010-04-12 12:44:59 UTC (rev 103824)
@@ -40,6 +40,21 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
+
+ <!-- Surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ <includes>
+ <include>**/*TestSuite.java</include>
+ </includes>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Copied: trunk/system/src/test/java/org (from rev 103813, trunk/system/src/tests/org)
Modified: trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java 2010-04-12 08:39:19 UTC (rev 103813)
+++ trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java 2010-04-12 12:44:59 UTC (rev 103824)
@@ -37,9 +37,9 @@
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
+ * @version $Revision: 92346 $
*/
-public class AbstractComponentMapperTest extends TestCase
+public abstract class AbstractComponentMapperTest extends TestCase
{
/** The managed object factory. */
Modified: trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/ComponentMapperUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/ComponentMapperUnitTestCase.java 2010-04-12 08:39:19 UTC (rev 103813)
+++ trunk/system/src/test/java/org/jboss/test/server/profileservice/component/persistence/test/ComponentMapperUnitTestCase.java 2010-04-12 12:44:59 UTC (rev 103824)
@@ -43,7 +43,7 @@
* Basic component mapper unit test case.
*
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
+ * @version $Revision: 92346 $
*/
public class ComponentMapperUnitTestCase extends AbstractComponentMapperTest
{
@@ -71,10 +71,13 @@
ManagedComponent component = new TestMgtComponentImpl(temp);
ManagedObject mo = createDeploymentMO();
+
PersistenceRoot root = getPersistenceFactory().addComponent(mo, component);
+ root.setClassName(TestDeployment.class.getName());
root = restore(root);
+
TestDeployment attachment = createDeploymentMetaData();
getPersistenceFactory().restorePersistenceRoot(root, attachment, null);
@@ -96,6 +99,8 @@
// create the persistence information
TestMgtComponentImpl tComp1 = new TestMgtComponentImpl(component1);
PersistenceRoot root = getPersistenceFactory().updateComponent(mo, tComp1);
+ root.setClassName(TestDeployment.class.getName());
+
TestMgtComponentImpl tComp2 = new TestMgtComponentImpl(component2);
root = getPersistenceFactory().updateComponent(root, mo, tComp2);
@@ -132,6 +137,7 @@
// create the persistence information
TestMgtComponentImpl tComp1 = new TestMgtComponentImpl(component1);
PersistenceRoot root = getPersistenceFactory().removeComponent(mo, tComp1);
+ root.setClassName(TestDeployment.class.getName());
PersistenceRoot persisted = restore(root);
// Check removed
@@ -154,6 +160,7 @@
ManagedObject mo = createDeploymentMO();
PersistenceRoot root = new PersistenceRoot();
+ root.setClassName(TestDeployment.class.getName());
TestDeployment deployment = updateName(root, mo, "change1");
mo = getMOF().initManagedObject(deployment, null);
Modified: trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockAttachmentStore.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2010-04-12 08:39:19 UTC (rev 103813)
+++ trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockAttachmentStore.java 2010-04-12 12:44:59 UTC (rev 103824)
@@ -99,5 +99,18 @@
}
+ public PersistenceRoot loadAttachment(String deploymentName, String simpleName, AttachmentMetaData attachment)
+ throws Exception
+ {
+ // FIXME loadAttachment
+ return null;
+ }
+
+ public RepositoryAttachmentMetaData loadMetaData(String deploymentName, String simpleName) throws Exception
+ {
+ // FIXME loadMetaData
+ return null;
+ }
+
}
Modified: trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockServerConfig.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java 2010-04-12 08:39:19 UTC (rev 103813)
+++ trunk/system/src/test/java/org/jboss/test/server/profileservice/support/MockServerConfig.java 2010-04-12 12:44:59 UTC (rev 103824)
@@ -23,6 +23,7 @@
import java.io.File;
import java.net.URL;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -320,5 +321,11 @@
return null;
}
+ public List getBootstrapDescriptors()
+ {
+ // FIXME getBootstrapDescriptors
+ return null;
+ }
+
}
Copied: trunk/system/src/test/java/readme.html (from rev 103813, trunk/system/src/tests/readme.html)
===================================================================
--- trunk/system/src/test/java/readme.html (rev 0)
+++ trunk/system/src/test/java/readme.html 2010-04-12 12:44:59 UTC (rev 103824)
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+ <!-- $Id$ -->
+ </head>
+
+ <body bgcolor="white">
+ <h1>System Unit Tests</h1>
+ The system module unit tests rely on the following system module locations:
+ <ul>
+ <li>src/resources/tests/bootstrap : for the ProfileService based bootstrap
+ tests to load the bootstrap-deployers.xml descriptor.</li>
+ <li>src/resources/tests/conf : for the test-log4j.xml when running from the
+ command line to generate a test.log file.</li>
+ <li>src/resources/tests/xml : to locate unit test related descriptors.</li>
+ </ul>
+
+ <h2>The build-test.xml ant file</h1>
+ The build-test.xml ant file is used to compile and run the tests outside of
+ eclipse.
+ </body>
+</html>
More information about the jboss-cvs-commits
mailing list