From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().

---
 opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
index 3165bf4..1eef1fc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -450,7 +450,7 @@
       Assert.assertEquals(child.getMandatoryClassProperty(),
           "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
       Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-          DirectoryServer.getAttributeType("description"));
+          DirectoryServer.getAttributeTypeOrNull("description"));
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
           "dc=new value 1,dc=com", "dc=new value 2,dc=com");
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -499,7 +499,7 @@
       Assert.assertEquals(child.getMandatoryClassProperty(),
           "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
       Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-          DirectoryServer.getAttributeType("description"));
+          DirectoryServer.getAttributeTypeOrNull("description"));
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
           "dc=new value 1,dc=com", "dc=new value 2,dc=com");
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -547,7 +547,7 @@
       Assert.assertEquals(child.getMandatoryClassProperty(),
           "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
       Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-          DirectoryServer.getAttributeType("description"));
+          DirectoryServer.getAttributeTypeOrNull("description"));
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
           "dc=domain1,dc=com", "dc=domain2,dc=com", "dc=domain3,dc=com");
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -596,7 +596,7 @@
       Assert.assertEquals(child.getMandatoryClassProperty(),
           "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
       Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-          DirectoryServer.getAttributeType("description"));
+          DirectoryServer.getAttributeTypeOrNull("description"));
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
           "dc=new value 1,dc=com", "dc=new value 2,dc=com");
       assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -713,7 +713,7 @@
     Assert.assertEquals(parent.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(parent.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(parent.getOptionalMultiValuedDNProperty(),
         "dc=domain1,dc=com", "dc=domain2,dc=com", "dc=domain3,dc=com");
   }
@@ -733,7 +733,7 @@
     Assert.assertEquals(parent.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(parent.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(parent.getOptionalMultiValuedDNProperty(),
         "dc=default value p2v1,dc=com", "dc=default value p2v2,dc=com");
   }
@@ -745,7 +745,7 @@
     Assert.assertEquals(child.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
         "dc=domain1,dc=com", "dc=domain2,dc=com", "dc=domain3,dc=com");
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -759,7 +759,7 @@
     Assert.assertEquals(child.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
         "dc=default value c2v1,dc=com", "dc=default value c2v2,dc=com");
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -773,7 +773,7 @@
     Assert.assertEquals(child.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
         "dc=default value c3v1,dc=com", "dc=default value c3v2,dc=com");
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),
@@ -787,7 +787,7 @@
     Assert.assertEquals(child.getMandatoryClassProperty(),
         "org.opends.server.extensions.UserDefinedVirtualAttributeProvider");
     Assert.assertEquals(child.getMandatoryReadOnlyAttributeTypeProperty(),
-        DirectoryServer.getAttributeType("description"));
+        DirectoryServer.getAttributeTypeOrNull("description"));
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty1(),
         "dc=default value p2v1,dc=com", "dc=default value p2v2,dc=com");
     assertDNSetEquals(child.getOptionalMultiValuedDNProperty2(),

--
Gitblit v1.10.0