[WFLY-2783] Bundle path not mandatory for embedded container

tommysdk · bstansberry · commit 3a38feef79ef · 2014-04-05T12:08:33.000-05:00
diff --git a/arquillian/container-embedded/src/main/java/org/jboss/as/arquillian/container/embedded/EmbeddedContainerConfiguration.java b/arquillian/container-embedded/src/main/java/org/jboss/as/arquillian/container/embedded/EmbeddedContainerConfiguration.java
@@ -47,10 +47,6 @@ public EmbeddedContainerConfiguration() {
         if ((modulePath == null || modulePath.isEmpty()) && jbossHome != null) {
             modulePath = jbossHome + "/modules";
         }
-
-        if ((bundlePath == null || bundlePath.isEmpty()) && jbossHome != null) {
-            bundlePath = jbossHome + "/bundles";
-        }
     }
 
     /**
@@ -101,6 +97,8 @@ public void validate() throws ConfigurationException {
         super.validate();
         Validate.configurationDirectoryExists(jbossHome, "jbossHome '" + jbossHome + "' must exist");
         Validate.configurationDirectoryExists(modulePath, "modulePath '" + modulePath + "' must exist");
-        Validate.configurationDirectoryExists(bundlePath, "bundlePath '" + bundlePath + "' must exist");
+        if (bundlePath != null) {
+            Validate.configurationDirectoryExists(bundlePath, "bundlePath '" + bundlePath + "' must exist");
+        }
     }
 }
diff --git a/arquillian/container-embedded/src/test/java/org/jboss/as/arquillian/container/embedded/EmbeddedContainerConfigurationTestCase.java b/arquillian/container-embedded/src/test/java/org/jboss/as/arquillian/container/embedded/EmbeddedContainerConfigurationTestCase.java
@@ -41,13 +41,27 @@ public void shouldValidateThatModulePathIsNonExisting() {
         validate(conf);
     }
 
-    @Test(expected = ConfigurationException.class)
-    public void shouldValidateThatBundlePathIsNonExisting() {
+    @Test
+    public void shouldNotValidateBundlePathIfNonExisting() {
+        final EmbeddedContainerConfiguration conf = new EmbeddedContainerConfiguration();
+        conf.setBundlePath(null);
+        validate(conf);
+    }
+
+    @Test
+    public void shouldValidateBundlePathIfExisting() {
         final EmbeddedContainerConfiguration conf = new EmbeddedContainerConfiguration();
-        conf.setBundlePath("");
+        conf.setBundlePath("/");
         validate(conf);
     }
 
+    @Test(expected = ConfigurationException.class)
+    public void shouldValidateThatJbossHomePathIsNonExisting() {
+        final EmbeddedContainerConfiguration conf = new EmbeddedContainerConfiguration();
+        conf.setJbossHome(null);
+        conf.validate();
+    }
+
     @Test
     public void shouldValidateThatModulePathAndBundlePathExists() {
         final EmbeddedContainerConfiguration conf = new EmbeddedContainerConfiguration();
@@ -59,13 +73,15 @@ public void shouldValidateThatModulePathAndBundlePathExists() {
     private void validate(final EmbeddedContainerConfiguration conf) {
         assertNotNull(conf.getJbossHome());
         assertNotNull(conf.getModulePath());
-        assertNotNull(conf.getBundlePath());
         conf.validate();
     }
 
     private static void createDir(final String path) {
-        File dir = new File(path);
-        if (!dir.exists())
-            assertTrue("Failed to create directory", dir.mkdirs());
+        if (path != null) {
+            File dir = new File(path);
+            if (!dir.exists()) {
+                assertTrue("Failed to create directory", dir.mkdirs());
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,6 @@ public EmbeddedContainerConfiguration() {`
`47`	`47`	`if ((modulePath == null \|\| modulePath.isEmpty()) && jbossHome != null) {`
`48`	`48`	`modulePath = jbossHome + "/modules";`
`49`	`49`	`}`
`50`		`-`
`51`		`- if ((bundlePath == null \|\| bundlePath.isEmpty()) && jbossHome != null) {`
`52`		`- bundlePath = jbossHome + "/bundles";`
`53`		`- }`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`/**`
`@@ -101,6 +97,8 @@ public void validate() throws ConfigurationException {`
`101`	`97`	`super.validate();`
`102`	`98`	`Validate.configurationDirectoryExists(jbossHome, "jbossHome '" + jbossHome + "' must exist");`
`103`	`99`	`Validate.configurationDirectoryExists(modulePath, "modulePath '" + modulePath + "' must exist");`
`104`		`- Validate.configurationDirectoryExists(bundlePath, "bundlePath '" + bundlePath + "' must exist");`
	`100`	`+ if (bundlePath != null) {`
	`101`	`+ Validate.configurationDirectoryExists(bundlePath, "bundlePath '" + bundlePath + "' must exist");`
	`102`	`+ }`
`105`	`103`	`}`
`106`	`104`	`}`