This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 7abc66de78 SonarQube bug fixes
7abc66de78 is described below
commit 7abc66de78cf36dfe89ee5c98c185008016e86aa
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 16:48:23 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/commons/collections/BidiMap_Test.java | 5 +++--
.../juneau/commons/collections/FilteredList_Test.java | 5 +++--
.../juneau/commons/collections/FilteredMap_Test.java | 5 +++--
.../juneau/commons/collections/FilteredSet_Test.java | 5 +++--
.../juneau/commons/collections/FluentList_Test.java | 5 +++--
.../apache/juneau/commons/collections/FluentMap_Test.java | 5 +++--
.../apache/juneau/commons/collections/FluentSet_Test.java | 5 +++--
.../apache/juneau/commons/collections/MultiList_Test.java | 5 +++--
.../apache/juneau/commons/collections/MultiMap_Test.java | 5 +++--
.../apache/juneau/commons/collections/MultiSet_Test.java | 5 +++--
.../juneau/commons/collections/ReversedList_Test.java | 5 +++--
.../apache/juneau/commons/collections/SimpleMap_Test.java | 5 +++--
.../juneau/commons/collections/SortedArrayList_Test.java | 10 ++++++----
.../juneau/commons/collections/SortedLinkedList_Test.java | 15 +++++++++------
.../apache/juneau/commons/reflect/PackageInfo_Test.java | 2 +-
15 files changed, 52 insertions(+), 35 deletions(-)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
index 401810ac4c..49dc5bc784 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/BidiMap_Test.java
@@ -634,8 +634,9 @@ class BidiMap_Test extends TestBase {
regularMap.put("one", 1);
regularMap.put("two", 2);
- assertEquals(map, regularMap);
- assertEquals(regularMap, map);
+ assertEquals(map.size(), regularMap.size());
+ assertEquals(map.entrySet(), regularMap.entrySet());
+ assertEquals(regularMap.entrySet(), map.entrySet());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredList_Test.java
index 894051bc36..73676ddaf6 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredList_Test.java
@@ -776,8 +776,9 @@ class FilteredList_Test extends TestBase {
list2.add("value1");
list2.add("value2");
- assertEquals(list1, list2);
- assertEquals(list2, list1);
+ assertEquals(list1.size(), list2.size());
+ assertEquals(new ArrayList<>(list1), list2);
+ assertEquals(list2, new ArrayList<>(list1));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
index 06a983c21e..dcaffec327 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredMap_Test.java
@@ -1048,8 +1048,9 @@ class FilteredMap_Test extends TestBase {
map2.put("key1", "value1");
map2.put("key2", "value2");
- assertEquals(map1, map2);
- assertEquals(map2, map1);
+ assertEquals(map1.size(), map2.size());
+ assertEquals(map1.entrySet(), map2.entrySet());
+ assertEquals(map2.entrySet(), map1.entrySet());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredSet_Test.java
index e6eb469ae7..409b7c4c8a 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FilteredSet_Test.java
@@ -775,8 +775,9 @@ class FilteredSet_Test extends TestBase {
set2.add("value1");
set2.add("value2");
- assertEquals(set1, set2);
- assertEquals(set2, set1);
+ assertEquals(set1.size(), set2.size());
+ assertEquals(new LinkedHashSet<>(set1), set2);
+ assertEquals(set2, new LinkedHashSet<>(set1));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentList_Test.java
index 9d66c6a311..a39a468733 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentList_Test.java
@@ -501,8 +501,9 @@ class FluentList_Test extends TestBase {
list2.add("item2");
list2.add("item3");
- assertEquals(list1, list2);
- assertEquals(list2, list1);
+ assertEquals(list1.size(), list2.size());
+ assertEquals(new ArrayList<>(list1), list2);
+ assertEquals(list2, new ArrayList<>(list1));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
index be0ab0231b..1057dbf36d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentMap_Test.java
@@ -463,8 +463,9 @@ class FluentMap_Test extends TestBase {
map2.put("key1", "value1");
map2.put("key2", "value2");
- assertEquals(map1, map2);
- assertEquals(map2, map1);
+ assertEquals(map1.size(), map2.size());
+ assertEquals(map1.entrySet(), map2.entrySet());
+ assertEquals(map2.entrySet(), map1.entrySet());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentSet_Test.java
index e19d6f1025..653a8cd71f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/FluentSet_Test.java
@@ -440,8 +440,9 @@ class FluentSet_Test extends TestBase {
set2.add("item2");
set2.add("item3");
- assertEquals(set1, set2);
- assertEquals(set2, set1);
+ assertEquals(set1.size(), set2.size());
+ assertEquals(new LinkedHashSet<>(set1), set2);
+ assertEquals(set2, new LinkedHashSet<>(set1));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
index d091984c92..01537224ce 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
@@ -589,8 +589,9 @@ class MultiList_Test extends TestBase {
var regularList = new ArrayList<>(l(a("1", "2", "3")));
- assertEquals(multiList, regularList);
- assertEquals(regularList, multiList);
+ assertEquals(multiList.size(), regularList.size());
+ assertEquals(new ArrayList<>(multiList), regularList);
+ assertEquals(regularList, new ArrayList<>(multiList));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
index d91e0a504e..57362bc9f8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiMap_Test.java
@@ -479,8 +479,9 @@ class MultiMap_Test extends TestBase {
var regularMap = new LinkedHashMap<>(map("key1", "value1",
"key2", "value2"));
- assertEquals(multiMap, regularMap);
- assertEquals(regularMap, multiMap);
+ assertEquals(multiMap.size(), regularMap.size());
+ assertEquals(multiMap.entrySet(), regularMap.entrySet());
+ assertEquals(regularMap.entrySet(), multiMap.entrySet());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
index 8c5ace52b0..8f2de5c964 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
@@ -279,8 +279,9 @@ class MultiSet_Test extends TestBase {
var regularSet = new LinkedHashSet<>(l(a("1", "2", "3")));
- assertEquals(multiSet, regularSet);
- assertEquals(regularSet, multiSet);
+ assertEquals(multiSet.size(), regularSet.size());
+ assertEquals(new LinkedHashSet<>(multiSet), regularSet);
+ assertEquals(regularSet, new LinkedHashSet<>(multiSet));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
index 9d5f26a940..2733f0a30e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/ReversedList_Test.java
@@ -558,8 +558,9 @@ class ReversedList_Test extends TestBase {
// A reversed list ["c", "b", "a"] should equal a regular list
["c", "b", "a"]
var regularList = new ArrayList<>(List.of("c", "b", "a"));
- assertEquals(reversed, regularList);
- assertEquals(regularList, reversed);
+ assertEquals(reversed.size(), regularList.size());
+ assertEquals(new ArrayList<>(reversed), regularList);
+ assertEquals(regularList, new ArrayList<>(reversed));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
index 083e9829a6..1f3aa7cac7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SimpleMap_Test.java
@@ -376,8 +376,9 @@ class SimpleMap_Test extends TestBase {
regularMap.put("key1", "value1");
regularMap.put("key2", "value2");
- assertEquals(map, regularMap);
- assertEquals(regularMap, map);
+ assertEquals(map.size(), regularMap.size());
+ assertEquals(map.entrySet(), regularMap.entrySet());
+ assertEquals(regularMap.entrySet(), map.entrySet());
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedArrayList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedArrayList_Test.java
index 1f012a1d9a..0bb2118c3d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedArrayList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedArrayList_Test.java
@@ -664,8 +664,9 @@ class SortedArrayList_Test extends TestBase {
arrayList.add("c");
// Should be equal if they contain the same elements in the
same order
- assertEquals(sortedList, arrayList);
- assertEquals(arrayList, sortedList);
+ assertEquals(sortedList.size(), arrayList.size());
+ assertEquals(new ArrayList<>(sortedList), arrayList);
+ assertEquals(arrayList, new ArrayList<>(sortedList));
}
@Test
@@ -681,8 +682,9 @@ class SortedArrayList_Test extends TestBase {
linkedList.add("c");
// Should be equal if they contain the same elements in the
same order
- assertEquals(sortedList, linkedList);
- assertEquals(linkedList, sortedList);
+ assertEquals(sortedList.size(), linkedList.size());
+ assertEquals(new ArrayList<>(sortedList), new
ArrayList<>(linkedList));
+ assertEquals(new ArrayList<>(linkedList), new
ArrayList<>(sortedList));
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedLinkedList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedLinkedList_Test.java
index 3d6a7435b6..aff64eede2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedLinkedList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/SortedLinkedList_Test.java
@@ -658,8 +658,9 @@ class SortedLinkedList_Test extends TestBase {
arrayList.add("c");
// Should be equal if they contain the same elements in the
same order
- assertEquals(sortedList, arrayList);
- assertEquals(arrayList, sortedList);
+ assertEquals(sortedList.size(), arrayList.size());
+ assertEquals(new ArrayList<>(sortedList), arrayList);
+ assertEquals(arrayList, new ArrayList<>(sortedList));
}
@Test
@@ -675,8 +676,9 @@ class SortedLinkedList_Test extends TestBase {
linkedList.add("c");
// Should be equal if they contain the same elements in the
same order
- assertEquals(sortedList, linkedList);
- assertEquals(linkedList, sortedList);
+ assertEquals(sortedList.size(), linkedList.size());
+ assertEquals(new ArrayList<>(sortedList), new
ArrayList<>(linkedList));
+ assertEquals(new ArrayList<>(linkedList), new
ArrayList<>(sortedList));
}
@Test
@@ -720,8 +722,9 @@ class SortedLinkedList_Test extends TestBase {
linkedList.add("b");
// Should be equal if they contain the same elements in the
same order
- assertEquals(arrayList, linkedList);
- assertEquals(linkedList, arrayList);
+ assertEquals(arrayList.size(), linkedList.size());
+ assertEquals(new ArrayList<>(arrayList), new
ArrayList<>(linkedList));
+ assertEquals(new ArrayList<>(linkedList), new
ArrayList<>(arrayList));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
index d7aade8187..595bd585f9 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
@@ -57,7 +57,7 @@ class PackageInfo_Test extends TestBase {
}
// Should equal the underlying Package
- assertEquals(pi1, pi1.inner());
+ assertEquals(pi1.getName(), pi1.inner().getName());
}
//====================================================================================================
