Pass ServerContext object down method calls to the pluggable backend Import...

Jean-Noel Rouvignac

26.01.2015 c0a5d19fa897c532ced3e13e01f18f869270e9a0

 opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestRebuildJob.java

@@ -161,8 +161,7 @@
    RebuildConfig rebuildConfig = new RebuildConfig();
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex(index);
    backend = DirectoryServer.getBackend(backendID);
    backend.rebuildBackend(rebuildConfig);
    rebuildBackend(backendID, rebuildConfig);

    if(index.contains(".") && !index.startsWith("vlv."))
    {
@@ -188,8 +187,7 @@
    RebuildConfig rebuildConfig = new RebuildConfig();
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex("id2entry");
    backend = DirectoryServer.getBackend(backendID);
    backend.rebuildBackend(rebuildConfig);
    rebuildBackend(backendID, rebuildConfig);

  }

@@ -207,11 +205,10 @@
    RebuildConfig rebuildConfig = new RebuildConfig();
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex("id2entry");
    backend = DirectoryServer.getBackend(backendID);
    TaskUtils.disableBackend(backendID);

    try {
      backend.rebuildBackend(rebuildConfig);
      rebuildBackend(backendID, rebuildConfig);
    } finally {
      TaskUtils.enableBackend(backendID);
    }
@@ -224,8 +221,7 @@
    RebuildConfig rebuildConfig = new RebuildConfig();
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex(index);
    backend = DirectoryServer.getBackend(backendID);
    backend.rebuildBackend(rebuildConfig);
    rebuildBackend(backendID, rebuildConfig);
  }

  @Test(dataProvider = "systemIndexes",
@@ -236,8 +232,7 @@
    RebuildConfig rebuildConfig = new RebuildConfig();
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex(index);
    backend = DirectoryServer.getBackend(backendID);
    backend.rebuildBackend(rebuildConfig);
    rebuildBackend(backendID, rebuildConfig);
  }

  @Test(dataProvider = "systemIndexes")
@@ -248,9 +243,8 @@
    rebuildConfig.setBaseDN(baseDNs[0]);
    rebuildConfig.addRebuildIndex(index);

    backend = DirectoryServer.getBackend(backendID);
    TaskUtils.disableBackend(backendID);
    backend.rebuildBackend(rebuildConfig);
    rebuildBackend(backendID, rebuildConfig);

    //TODO: Verify dn2uri database as well.
    if (!"dn2uri".equalsIgnoreCase(index))
@@ -296,11 +290,10 @@

  private void rebuildIndexes(RebuildConfig rebuildConfig) throws Exception
  {
    backend = DirectoryServer.getBackend(backendID);
    TaskUtils.disableBackend(backendID);
    try
    {
      backend.rebuildBackend(rebuildConfig);
      rebuildBackend(backendID, rebuildConfig);
      assertEquals(verifyBackend(null), 0);
    }
    finally
@@ -309,6 +302,12 @@
    }
  }

  private void rebuildBackend(String backendID, RebuildConfig rebuildConfig) throws Exception
  {
    backend = DirectoryServer.getBackend(backendID);
    backend.rebuildBackend(rebuildConfig, DirectoryServer.getInstance().getServerContext());
  }

  @Test
  public void testRebuildRedundentIndexes() throws Exception
  {