Reenabling the quicksetup tests. The problems encountered last week have a...

kenneth_suter

27.05.2007 daf79793fe27b5194d1dee338f3a9f12e18f023d

 opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java

File was renamed from opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/Utils.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");
  }

}