From daf79793fe27b5194d1dee338f3a9f12e18f023d Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 27 Jun 2007 14:05:11 +0000
Subject: [PATCH] Reenabling the quicksetup tests. The problems encountered last week have apparently been resolved. All tests pass when performing a complete run of the tests using the 'testall' target along with the BUILD_NUMBER system property.
---
opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/Utils.java b/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
similarity index 93%
rename from opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/Utils.java
rename to opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
index cba2d36..d6120a6 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/Utils.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
@@ -29,6 +29,7 @@
import org.opends.quicksetup.util.ZipExtractor;
import org.opends.quicksetup.util.ServerController;
+import org.opends.quicksetup.util.FileManager;
import org.opends.server.TestCaseUtils;
import org.opends.server.types.OperatingSystem;
@@ -42,7 +43,7 @@
/**
*
*/
-public class Utils {
+public class TestUtilities {
/**
* The name of the system property that specifies the server build root.
@@ -64,9 +65,7 @@
if (!initialized) {
if (qsServerRoot.exists()) {
stopServer();
- if (!qsServerRoot.delete()) {
- throw new IllegalStateException("cannot delete stale installation");
- }
+ new FileManager().deleteRecursively(qsServerRoot);
}
ZipExtractor extractor = new ZipExtractor(getInstallPackageFile());
extractor.extract(qsServerRoot);
@@ -76,7 +75,7 @@
}
static public Installation getInstallation() {
- return new Installation(Utils.getQuickSetupTestServerRootDir());
+ return new Installation(getQuickSetupTestServerRootDir());
}
static private void setupServer() throws IOException, InterruptedException {
@@ -139,11 +138,15 @@
return installPackageFile;
}
- static public File getQuickSetupTestServerRootDir() {
+ static public File getQuickSetupTestWorkspace() {
String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT);
File buildDir = new File(buildRoot, "build");
File unitRootDir = new File(buildDir, "unit-tests");
return new File(unitRootDir, "quicksetup");
}
+ static public File getQuickSetupTestServerRootDir() {
+ return new File(getQuickSetupTestWorkspace(), "OpenDS");
+ }
+
}
--
Gitblit v1.10.0