[jboss-cvs] JBossAS SVN: r94058 - in projects/jboss-deployers/branches/Branch_2_0: deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 28 07:33:11 EDT 2009
Author: alesj
Date: 2009-09-28 07:33:10 -0400 (Mon, 28 Sep 2009)
New Revision: 94058
Added:
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
Removed:
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
Modified:
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java
Log:
Port trunk fix to branch.
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java 2009-09-28 11:25:58 UTC (rev 94057)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/test/java/org/jboss/test/deployers/structure/structurebuilder/AbstractStructureBuilderTest.java 2009-09-28 11:33:10 UTC (rev 94058)
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.client.spi.DeploymentFactory;
@@ -135,25 +136,33 @@
return deployment;
}
- protected Deployment createOrderedChildren() throws Exception
+ protected Deployment createOrderedChildren(String... names) throws Exception
{
DeploymentFactory factory = getDeploymentFactory();
Deployment deployment = createDeployment(factory);
- ContextInfo ctx = factory.addContext(deployment, "child1");
- ctx.setRelativeOrder(1);
- ctx = factory.addContext(deployment, "child2");
- ctx.setRelativeOrder(2);
-
+ for (int i = 0; names != null && i < names.length; i++)
+ {
+ ContextInfo ctx = factory.addContext(deployment, "child" + names[i]);
+ ctx.setRelativeOrder(i + 1);
+ }
return deployment;
}
public void testOrderedChildren() throws Exception
{
- Deployment deployment = createOrderedChildren();
+ String[] names = new String[]{"123", "132", "213", "231", "312", "321"};
+ String random = names[new Random().nextInt(6)];
+ log.info("Random: " + random);
+ names = new String[]{String.valueOf(random.charAt(0)), String.valueOf(random.charAt(1)), String.valueOf(random.charAt(2))};
+
+ Deployment deployment = createOrderedChildren(names);
DeploymentContext context = build(deployment);
- assertEquals("child1", context.getChildren().get(0).getRelativePath());
- assertEquals("child2", context.getChildren().get(1).getRelativePath());
+ for (int i = 0; i < names.length; i++)
+ {
+ assertEquals("child" + names[i], context.getChildren().get(i).getRelativePath());
+ }
+
checkDeployment(context, deployment);
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java 2009-09-28 11:25:58 UTC (rev 94057)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structurebuilder/test/FilesStructureBuilderUnitTestCase.java 2009-09-28 11:33:10 UTC (rev 94058)
@@ -113,4 +113,10 @@
{
return createDefaultDeployment();
}
+
+ @Override
+ public void testOrderedChildren() throws Exception
+ {
+ // ignore this test
+ }
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren (from rev 94057, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-09-28 11:25:58 UTC (rev 94057)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-09-28 11:33:10 UTC (rev 94058)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 (from rev 94057, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child1 2009-09-28 11:33:10 UTC (rev 94058)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-09-28 11:25:58 UTC (rev 94057)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-09-28 11:33:10 UTC (rev 94058)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 (from rev 94057, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child2 2009-09-28 11:33:10 UTC (rev 94058)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-09-28 11:25:58 UTC (rev 94057)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-09-28 11:33:10 UTC (rev 94058)
@@ -1 +0,0 @@
-empty
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 (from rev 94057, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structurebuilder/predetermined/testOrderedChildren/child3 2009-09-28 11:33:10 UTC (rev 94058)
@@ -0,0 +1 @@
+empty
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list