From 14f94c13789b8ace4eae258b5f1d64494518f9c3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 21 Dec 2015 14:04:12 +0000
Subject: [PATCH] Remove null checks on returned values of Entry.get*Attribute*() methods.

---
 opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 0f1a3e8..ccf090d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -26,7 +26,7 @@
  */
 package org.opends.server.plugins;
 
-
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
@@ -49,8 +49,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.*;
-
 /**
  * This class defines a set of tests for the
  * org.opends.server.plugins.EntryUUIDPlugin class.
@@ -274,7 +272,7 @@
          DirectoryServer.getPluginConfigManager().getRegisteredPlugin(dn);
     plugin.doLDIFImport(importConfig, e);
 
-    assertNotNull(e.getAttribute("entryuuid"));
+    assertThat(e.getAttribute("entryuuid")).isNotEmpty();
   }
 
 
@@ -315,7 +313,7 @@
          DirectoryServer.getPluginConfigManager().getRegisteredPlugin(dn);
     plugin.doLDIFImport(importConfig, e);
 
-    assertNotNull(e.getAttribute("entryuuid"));
+    assertThat(e.getAttribute("entryuuid")).isNotEmpty();
   }
 
 
@@ -334,7 +332,7 @@
                                       "objectClass: top",
                                       "objectClass: device",
                                       "cn: test");
-    assertNotNull(e.getAttribute("entryuuid"));
+    assertThat(e.getAttribute("entryuuid")).isNotEmpty();
   }
 
 
@@ -356,7 +354,6 @@
                                       "objectClass: device",
                                       "cn: test",
                                       "entryUUID: " + UUID.randomUUID());
-    assertNotNull(e.getAttribute("entryuuid"));
+    assertThat(e.getAttribute("entryuuid")).isNotEmpty();
   }
 }
-

--
Gitblit v1.10.0