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/admin/ManagedObjectPathTest.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
index 475f873..1854746 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/ManagedObjectPathTest.java
@@ -22,13 +22,11 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.admin;
-
-
+import static org.opends.server.TestCaseUtils.*;
import static org.testng.Assert.*;
import org.opends.server.DirectoryServerTestCase;
@@ -49,8 +47,6 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
-
/**
* ManagedObjectPath test cases.
*/
@@ -121,7 +117,7 @@
@Test
public void testEmptyPathHasNoRelation() {
ManagedObjectPath<?, ?> path = ManagedObjectPath.emptyPath();
- assertEquals(path.getRelationDefinition(), null);
+ assertNull(path.getRelationDefinition());
}
@@ -300,20 +296,20 @@
assertTrue(child1.matches(child2));
assertTrue(child2.matches(child1));
- assertTrue(child1.equals(child1));
- assertTrue(child2.equals(child2));
- assertFalse(child1.equals(child2));
- assertFalse(child2.equals(child1));
+ assertEquals(child1, child1);
+ assertEquals(child2, child2);
+ assertNotEquals(child1, child2);
+ assertNotEquals(child2, child1);
assertFalse(child1.matches(child3));
assertFalse(child2.matches(child3));
assertFalse(child3.matches(child1));
assertFalse(child3.matches(child2));
- assertFalse(child1.equals(child3));
- assertFalse(child2.equals(child3));
- assertFalse(child3.equals(child1));
- assertFalse(child3.equals(child2));
+ assertNotEquals(child1, child3);
+ assertNotEquals(child2, child3);
+ assertNotEquals(child3, child1);
+ assertNotEquals(child3, child2);
}
/**
--
Gitblit v1.10.0