svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.fo...

Violette Roche-Montane

07.50.2013 2e08d2c0e9bede644be993ddaa28157c9f156c10

 opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java

@@ -112,6 +112,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.OperatingSystem;
import org.opends.server.types.ResultCode;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.LDIFReader;

@@ -385,7 +386,7 @@
      {
        copyDirectory(libDir, testLibDir);
        copyDirectory(new File(resourceDir, "bin"), testBinDir);
        copyDirectory(new File(resourceDir, "config"), testConfigDir);
        copyDirectory(new File(resourceDir, "config"), testConfigDir );
        copyDirectory(new File(resourceDir, "schema"),
            new File(testSchemaDir, "schema"));
        copyDirectory(new File(resourceDir, "MakeLDIF"),
@@ -540,6 +541,11 @@
         TextDebugLogPublisher.getStartupTextDebugPublisher(
              DEBUG_TEXT_WRITER));

      // Writing the buildinfo with the current version.
      final FileWriter buildInfoWriter = new FileWriter (new File(testConfigDir, "buildinfo"));
      buildInfoWriter.write(BuildVersion.binaryVersion().toString());
      buildInfoWriter.close();

      EmbeddedUtils.startServer(config);

      assertTrue(InvocationCounterPlugin.startupCalled());