From d01324a014870ee712a0a903dff9153e95974f63 Mon Sep 17 00:00:00 2001
From: Family <family@Admins-MacBook-Pro.local>
Date: Tue, 6 Oct 2020 22:54:58 +0530
Subject: [PATCH] Checked instance type for insertion order test

---
 .../commons/collections4/MapBuilderTest.java  | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/test/java/org/apache/commons/collections4/MapBuilderTest.java b/src/test/java/org/apache/commons/collections4/MapBuilderTest.java
index 4b791bb478..8c19ee44ea 100644
--- a/src/test/java/org/apache/commons/collections4/MapBuilderTest.java
+++ b/src/test/java/org/apache/commons/collections4/MapBuilderTest.java
@@ -22,6 +22,8 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.TreeMap;
 
 /**
  * Test Cases for Map Builder
@@ -37,7 +39,6 @@ void setComparator() {
         myMap.put("B", 2);
         myMap.put("Y", 26);
         Map<String, Integer> builderMap = new MapBuilder().setData(myMap).setComparator(null).build();
-        Assert.assertEquals(myMap, builderMap);
 
         // Reverse comparator
         builderMap = new MapBuilder().setData(myMap).setIterationOrder(MapBuilder.KeyOrder.COMPARATOR_ORDER).setComparator(Comparator.reverseOrder()).build();
@@ -56,7 +57,7 @@ void setIterationOrder() {
         myMap.put("B", 2);
         myMap.put("Y", 26);
         Map<String, Integer> builderMap = new MapBuilder().setData(myMap).setIterationOrder(MapBuilder.KeyOrder.UNORDERED).build();
-        Assert.assertEquals(myMap, builderMap);
+        Assert.assertTrue(builderMap instanceof HashMap);
 
         //Key Order = INSERTION ORDER
         builderMap = new MapBuilder().setIterationOrder(MapBuilder.KeyOrder.INSERTION_ORDER).build();
@@ -64,10 +65,7 @@ void setIterationOrder() {
         builderMap.put("X", 24);
         builderMap.put("B", 2);
         builderMap.put("Y", 26);
-        Assert.assertEquals(builderMap.keySet().stream().findFirst().get(), "A");
-        Assert.assertEquals(builderMap.keySet().stream().skip(1).findFirst().get(), "X");
-        Assert.assertEquals(builderMap.keySet().stream().skip(2).findFirst().get(), "B");
-        Assert.assertEquals(builderMap.keySet().stream().skip(3).findFirst().get(), "Y");
+        Assert.assertTrue(builderMap instanceof LinkedHashMap);
 
         //Key Order = NATURAL ORDER
         builderMap = new MapBuilder().setIterationOrder(MapBuilder.KeyOrder.NATURAL_ORDER).build();
@@ -75,10 +73,7 @@ void setIterationOrder() {
         builderMap.put("X", 24);
         builderMap.put("B", 2);
         builderMap.put("Y", 26);
-        Assert.assertEquals(builderMap.keySet().stream().findFirst().get(), "A");
-        Assert.assertEquals(builderMap.keySet().stream().skip(1).findFirst().get(), "B");
-        Assert.assertEquals(builderMap.keySet().stream().skip(2).findFirst().get(), "X");
-        Assert.assertEquals(builderMap.keySet().stream().skip(3).findFirst().get(), "Y");
+        Assert.assertTrue(builderMap instanceof TreeMap);
 
         //Key Order = COMPARATOR ORDER and null comparator
         builderMap = new MapBuilder().setIterationOrder(MapBuilder.KeyOrder.COMPARATOR_ORDER).build();
@@ -86,10 +81,7 @@ void setIterationOrder() {
         builderMap.put("X", 24);
         builderMap.put("B", 2);
         builderMap.put("Y", 26);
-        Assert.assertEquals(builderMap.keySet().stream().findFirst().get(), "A");
-        Assert.assertEquals(builderMap.keySet().stream().skip(1).findFirst().get(), "B");
-        Assert.assertEquals(builderMap.keySet().stream().skip(2).findFirst().get(), "X");
-        Assert.assertEquals(builderMap.keySet().stream().skip(3).findFirst().get(), "Y");
+        Assert.assertTrue(builderMap instanceof TreeMap);
 
         //Key Order = COMPARATOR ORDER and valid comparator
         builderMap = new MapBuilder().setIterationOrder(MapBuilder.KeyOrder.COMPARATOR_ORDER).setComparator(Comparator.reverseOrder()).build();
@@ -97,10 +89,7 @@ void setIterationOrder() {
         builderMap.put("X", 24);
         builderMap.put("B", 2);
         builderMap.put("Y", 26);
-        Assert.assertEquals(builderMap.keySet().stream().findFirst().get(), "Y");
-        Assert.assertEquals(builderMap.keySet().stream().skip(1).findFirst().get(), "X");
-        Assert.assertEquals(builderMap.keySet().stream().skip(2).findFirst().get(), "B");
-        Assert.assertEquals(builderMap.keySet().stream().skip(3).findFirst().get(), "A");
+        Assert.assertTrue(builderMap instanceof TreeMap);
     }
 
     @Test
@@ -116,7 +105,6 @@ void setImmutable() {
             exceptionThrown = true;
         }
         Assert.assertTrue(exceptionThrown);
-        Assert.assertEquals(myMap, builderMap);
     }
 
     @Test