From 63377c8013bcb3513cfce0766c225b70d11ef09f Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Thu, 04 Oct 2018 11:37:46 +0000
Subject: [PATCH] remove duplicate assertNotEquals
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 38 +++++++++++++++++++-------------------
opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java | 2 +-
2 files changed, 20 insertions(+), 20 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 f5f32cb..116dea5 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
@@ -1923,26 +1923,26 @@
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)} 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)
- {
- try
- {
- Assert.assertEquals(actual1, actual2);
- Assert.fail(message);
- }
- catch (AssertionError e)
- {
- // this is good: they are not equals
- return;
- }
- }
+// /** 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)
+// {
+// try
+// {
+// Assert.assertEquals(actual1, actual2);
+// Assert.fail(message);
+// }
+// catch (AssertionError e)
+// {
+// // this is good: they are not equals
+// return;
+// }
+// }
public static int runLdapSearchTrustCertificateForSession(final String[] args)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index cc93af0..658776e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -278,7 +278,7 @@
Connection conn = factory.getConnection())
{
BindResult result = conn.bind(Requests.newExternalSASLBindRequest());
- TestCaseUtils.assertNotEquals(result.getResultCode(), ResultCode.SUCCESS);
+ assertNotEquals(result.getResultCode(), ResultCode.SUCCESS);
}
}
--
Gitblit v1.10.0