Author: [email protected]
Date: Thu Sep 15 15:58:22 2011
New Revision: 1380
Log:
AMDATU-408 Ensure unique tmp work directory backing each test
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/CoreFixture.java
Thu Sep 15 15:58:22 2011
@@ -23,7 +23,6 @@
import org.amdatu.core.config.templates.ConfigTemplateManager;
import org.amdatu.core.loghandler.service.ConsoleLogHandler;
import org.amdatu.core.tenant.TenantManagementService;
-import org.amdatu.core.tenant.TenantStorageProvider;
import org.amdatu.core.tenantstore.fs.service.FSTenantStorageProvider;
import org.amdatu.core.useradminstore.fs.service.FSUserAdminStorageConfigImpl;
import org.ops4j.pax.exam.Option;
Modified:
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
==============================================================================
---
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
(original)
+++
trunk/amdatu-core/itest/base/src/main/java/org/amdatu/core/itest/base/TestContext.java
Thu Sep 15 15:58:22 2011
@@ -19,6 +19,8 @@
import static org.hamcrest.core.IsNull.notNullValue;
import static org.junit.Assert.assertThat;
+import java.io.File;
+import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -49,6 +51,7 @@
public TestContext(BundleContext bundleContext) {
m_bundleContext = bundleContext;
m_dependencyManager = new DependencyManager(m_bundleContext);
+ createContextWorkDir();
}
public void tearDown() {
@@ -130,4 +133,16 @@
public ConfigurationAdmin getConfigurationAdmin() throws Exception {
return getService(ConfigurationAdmin.class);
}
+
+ private void createContextWorkDir() {
+ try {
+ File contextDir = File.createTempFile("testContext",
Long.toString(System.nanoTime()));
+ contextDir.delete();
+ contextDir.mkdir();
+ System.setProperty("amdatu.dir", contextDir.getAbsolutePath());
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
