From 3872f27722f9bf2f6a601a86bdc769aa933801d0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Apr 2015 15:07:12 +0000
Subject: [PATCH] AutoRefactor'ed TestNG assertions Code cleanup: - factorized code by extracting methods
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 2dc000b..843ab9a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -71,12 +71,10 @@
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.*;
import org.opends.server.types.FilePermission;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.Schema;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.LDIFReader;
+import org.testng.Assert;
import com.forgerock.opendj.util.OperatingSystem;
@@ -1987,4 +1985,28 @@
}
return dump.toString();
}
+
+ /** FIXME Replace with {@link Assert#assertNotEquals(Object, Object)} once we upgrade to testng >= 6.1. */
+ public static void assertNotEquals(Object actual1, Object actual2)
+ {
+ assertNotEquals(actual1, actual2, null);
+ }
+
+ /** FIXME Replace with {@link Assert#assertNotEquals(Object, Object, String)} once we upgrade to testng >= 6.1. */
+ public static void assertNotEquals(Object actual1, Object actual2, String message)
+ {
+ boolean fail = false;
+ try
+ {
+ Assert.assertEquals(actual1, actual2);
+ fail = true;
+ }
+ catch (AssertionError e)
+ {
+ }
+ if (fail)
+ {
+ Assert.fail(message);
+ }
+ }
}
--
Gitblit v1.10.0