From b68d5cc1a6352dddd67adf06b18c3690c683debe Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 07 Nov 2016 15:05:30 +0000
Subject: [PATCH] OPENDJ-3417 Move responsability of backends management to BackendConfigManager

---
 opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
index c532eb7..a3a1de4 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CommonEntryCacheTestCase.java
@@ -95,7 +95,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertFalse(cache.containsEntry(testEntriesList.get(0).getName()),
       "Not expected to find " + testEntriesList.get(0).getName() +
@@ -129,7 +129,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertNull(cache.getEntry(testEntriesList.get(0).getName()),
       "Not expected to find " + testEntriesList.get(0).getName() +
@@ -163,7 +163,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertNull(cache.getEntry(testEntriesList.get(0).getName()),
       "Not expected to find " + testEntriesList.get(0).getName() +
@@ -197,7 +197,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertNull(cache.getEntry(b, -1),
       "Not expected to find entry id " + -1 +
@@ -230,7 +230,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertEquals(cache.getEntryID(testEntriesList.get(0).getName()), -1,
       "Not expected to find " + testEntriesList.get(0).getName() +
@@ -263,7 +263,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     cache.putEntry(testEntriesList.get(0), b, 1);
 
@@ -296,7 +296,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     assertTrue(cache.putEntryIfAbsent(testEntriesList.get(0), b, 1),
       "Not expected to find " + testEntriesList.get(0).getName() +
@@ -337,7 +337,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     cache.removeEntry(testEntriesList.get(0).getName());
     cache.putEntry(testEntriesList.get(0), b, 1);
@@ -372,7 +372,7 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     cache.clear();
     cache.putEntry(testEntriesList.get(0), b, 1);
@@ -407,8 +407,8 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
-    String c = DirectoryServer.getBackend(DN.valueOf("cn=config")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
+    String c = DirectoryServer.getLocalBackend(DN.valueOf("cn=config")).getBackendID();
 
     cache.clearBackend(b);
     cache.putEntry(testEntriesList.get(0), b, 1);
@@ -449,8 +449,8 @@
       cache.toVerboseString());
 
     TestCaseUtils.initializeTestBackend(false);
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
-    String c = DirectoryServer.getBackend(DN.valueOf("cn=config")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
+    String c = DirectoryServer.getLocalBackend(DN.valueOf("cn=config")).getBackendID();
 
     cache.putEntry(testEntriesList.get(0), b, 1);
     Entry testEntry = testEntriesList.get(1);
@@ -510,7 +510,7 @@
   public void testCacheConcurrency()
          throws Exception
   {
-    String b = DirectoryServer.getBackend(DN.valueOf("o=test")).getBackendID();
+    String b = DirectoryServer.getLocalBackend(DN.valueOf("o=test")).getBackendID();
 
     for(int loops = 0; loops < CONCURRENCYLOOPS; loops++) {
       for(int i = 0; i < NUMTESTENTRIES; i++) {

--
Gitblit v1.10.0