- fix proper cleanup to cater for leftovers at temporary location after tes...

abobrov

22.01.2007 e0c7565dc724ad4800b3ca20780754f2ac561a83

- fix proper cleanup to cater for leftovers at temporary location after test completion.
 

 opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java

@@ -34,6 +34,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.testng.annotations.BeforeClass;
import org.opends.server.admin.std.meta.*;
import org.opends.server.admin.std.server.FileSystemEntryCacheCfg;
import org.opends.server.api.Backend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
@@ -63,6 +64,13 @@


  /**
   * Temporary folder to setup dummy JE backend environment in.
   */
  private static File jeBackendTempDir;



  /**
   * Utility method to restore default cache configuration.
   */
  @SuppressWarnings("unchecked")
@@ -121,8 +129,8 @@
          throws Exception
  {
    // Make sure JE directory exist.
    File tempDir = TestCaseUtils.createTemporaryDirectory("db-cachetest");
    String jeDir = tempDir.getAbsolutePath();
    jeBackendTempDir = TestCaseUtils.createTemporaryDirectory("db-cachetest");
    String jeDir = jeBackendTempDir.getAbsolutePath();

    // Create dummy JE backend for this test.
    TestCaseUtils.dsconfig("create-backend", "--backend-name", "cacheTest",
@@ -164,10 +172,9 @@
  private void persistentCacheTeardown()
          throws Exception
  {
    File tempDir = TestCaseUtils.createTemporaryDirectory("db-cachetest");

    // Dummy JE backend cleanup.
    TestCaseUtils.dsconfig("delete-backend", "--backend-name", "cacheTest");
    TestCaseUtils.deleteDirectory(tempDir);
    TestCaseUtils.deleteDirectory(jeBackendTempDir);

    // Configure this cache back to defaults.
    restoreCacheDefaults();
@@ -256,6 +263,11 @@
         throws Exception
  {
    super.cache.finalizeEntryCache();

    // Remove default FS cache JE environment.
    FileSystemEntryCacheCfg config =
      (FileSystemEntryCacheCfg) super.configuration;
    TestCaseUtils.deleteDirectory(new File(config.getCacheDirectory()));
  }