From 189541dd8370acb5965f8f09380f703d5121af0b Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Tue, 12 Feb 2019 16:11:42 +0000
Subject: [PATCH] FIX Reference to assertEquals is ambiguous
---
opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java | 24 ++++++++++++------------
opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java | 6 +++---
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
index 3592838..3de1005 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -245,8 +245,8 @@
AddOperationBasis genAddOpBasis = (AddOperationBasis) generatedOperation;
assertEquals(addOpBasis.getRawEntryDN(), genAddOpBasis.getRawEntryDN());
- assertEquals( addOpBasis.getAttachment(SYNCHROCONTEXT),
- genAddOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object) addOpBasis.getAttachment(SYNCHROCONTEXT),
+ (Object)genAddOpBasis.getAttachment(SYNCHROCONTEXT));
assertEquals(addOpBasis.getObjectClasses(), genAddOpBasis.getObjectClasses());
assertEquals(addOpBasis.getOperationalAttributes(), genAddOpBasis.getOperationalAttributes());
assertEquals(addOpBasis.getUserAttributes(), genAddOpBasis.getUserAttributes());
@@ -293,8 +293,8 @@
genAddOpBasis = (AddOperationBasis) generatedOperation;
assertEquals(addOpBasis.getRawEntryDN(), genAddOpBasis.getRawEntryDN());
- assertEquals( addOpBasis.getAttachment(SYNCHROCONTEXT),
- genAddOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object) addOpBasis.getAttachment(SYNCHROCONTEXT),
+ (Object)genAddOpBasis.getAttachment(SYNCHROCONTEXT));
assertEquals(addOpBasis.getObjectClasses(), genAddOpBasis.getObjectClasses());
assertEquals(addOpBasis.getOperationalAttributes(), genAddOpBasis.getOperationalAttributes());
assertEquals(addOpBasis.getUserAttributes(), genAddOpBasis.getUserAttributes());
@@ -546,8 +546,8 @@
ModifyOperationBasis genModOpBasisFromV1 = (ModifyOperationBasis) opFromV1;
assertEquals(modOpBasisFromOrigVlast.getRawEntryDN(), genModOpBasisFromV1.getRawEntryDN());
- assertEquals( modOpBasisFromOrigVlast.getAttachment(SYNCHROCONTEXT),
- genModOpBasisFromV1.getAttachment(SYNCHROCONTEXT));
+ assertEquals( (Object)modOpBasisFromOrigVlast.getAttachment(SYNCHROCONTEXT),
+ (Object)genModOpBasisFromV1.getAttachment(SYNCHROCONTEXT));
List<Modification> modsvlast = modOpBasisFromOrigVlast.getModifications();
List<Modification> modsv1 = genModOpBasisFromV1.getModifications();
@@ -595,8 +595,8 @@
assertEquals(modOpBasisFromOrigVlast.getRawEntryDN(),
modOpBasisFromGeneratedVlast.getRawEntryDN());
- assertEquals( modOpBasisFromOrigVlast.getAttachment(SYNCHROCONTEXT),
- modOpBasisFromGeneratedVlast.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object) modOpBasisFromOrigVlast.getAttachment(SYNCHROCONTEXT),
+ (Object)modOpBasisFromGeneratedVlast.getAttachment(SYNCHROCONTEXT));
assertEquals(modOpBasisFromOrigVlast.getModifications(),
modOpBasisFromGeneratedVlast.getModifications());
}
@@ -719,8 +719,8 @@
ModifyDNOperationBasis genModDnOpBasis = (ModifyDNOperationBasis) generatedOperation;
assertEquals(modDnOpBasis.getRawEntryDN(), genModDnOpBasis.getRawEntryDN());
- assertEquals( modDnOpBasis.getAttachment(SYNCHROCONTEXT),
- genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object) modDnOpBasis.getAttachment(SYNCHROCONTEXT),
+ (Object)genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
// Check default value for only VLAST fields
assertEquals(newMsg.getAssuredMode(), AssuredMode.SAFE_DATA_MODE);
@@ -770,8 +770,8 @@
genModDnOpBasis = (ModifyDNOperationBasis) generatedOperation;
assertEquals(modDnOpBasis.getRawEntryDN(), genModDnOpBasis.getRawEntryDN());
- assertEquals( modDnOpBasis.getAttachment(SYNCHROCONTEXT),
- genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object) modDnOpBasis.getAttachment(SYNCHROCONTEXT),
+ (Object)genModDnOpBasis.getAttachment(SYNCHROCONTEXT));
assertEquals(modDnOpBasis.getModifications(), genModDnOpBasis.getModifications());
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index 0b3e756..bdced44 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -190,8 +190,8 @@
ModifyOperation mod2 = (ModifyOperation) generatedMsg.createOperation(conn);
assertEquals(mod1.getRawEntryDN(), mod2.getRawEntryDN());
- assertEquals(mod1.getAttachment(SYNCHROCONTEXT),
- mod2.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object)mod1.getAttachment(SYNCHROCONTEXT),
+ (Object)mod2.getAttachment(SYNCHROCONTEXT));
assertEquals(mod1.getModifications(), mod2.getModifications());
}
@@ -494,7 +494,7 @@
AddOperation genAddOp = generatedMsg.createOperation(conn, dn);
assertEquals(addOp.getRawEntryDN(), genAddOp.getRawEntryDN());
- assertEquals(addOp.getAttachment(SYNCHROCONTEXT), genAddOp.getAttachment(SYNCHROCONTEXT));
+ assertEquals((Object)addOp.getAttachment(SYNCHROCONTEXT), (Object)genAddOp.getAttachment(SYNCHROCONTEXT));
assertEquals(addOp.getObjectClasses(), genAddOp.getObjectClasses());
assertEquals(addOp.getOperationalAttributes(), genAddOp.getOperationalAttributes());
assertEquals(addOp.getUserAttributes(), genAddOp.getUserAttributes());
--
Gitblit v1.10.0