Skip to content

Commit 2b48f57

Browse files
vmassolKimi Code
vmassol
and
Kimi Code
committed
[Misc] Use assertEquals/assertNotEquals instead of assertTrue/assertFalse with equals() (SonarQube java:S5785)
Co-Authored-By: Kimi Code <noreply@moonshot.cn>
1 parent f27100b commit 2b48f57

6 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎xwiki-commons-core/xwiki-commons-logging/xwiki-commons-logging-api/src/test/java/org/xwiki/logging/marker/TranslationMarkerTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import static org.junit.jupiter.api.Assertions.assertEquals;
2828
import static org.junit.jupiter.api.Assertions.assertFalse;
29+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2930
import static org.junit.jupiter.api.Assertions.assertTrue;
3031

3132
/**
@@ -108,8 +109,8 @@ void testHashCode()
108109
Marker otherMarker = MarkerFactory.getMarker("name");
109110

110111
assertEquals(equalsTMarker.hashCode(), this.marker.hashCode());
111-
assertFalse(this.marker.hashCode() == otherTMarker.hashCode());
112-
assertFalse(this.marker.hashCode() == otherMarker.hashCode());
112+
assertNotEquals(this.marker.hashCode(), otherTMarker.hashCode());
113+
assertNotEquals(this.marker.hashCode(), otherMarker.hashCode());
113114
}
114115

115116
@Test
@@ -120,7 +121,7 @@ void testEquals()
120121
Marker otherMarker = MarkerFactory.getMarker("name");
121122

122123
assertEquals(equalsTMarker, this.marker);
123-
assertFalse(this.marker.equals(otherTMarker));
124-
assertFalse(this.marker.equals(otherMarker));
124+
assertNotEquals(this.marker, otherTMarker);
125+
assertNotEquals(this.marker, otherMarker);
125126
}
126127
}

‎xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/ActionExecutionEventTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ void testActionExecutionEventString()
5353
assertEquals(event, event);
5454
assertEquals(event, new ActionExecutionEvent("action"));
5555

56-
assertFalse(event.equals(new ActionExecutionEvent("action2")));
57-
assertFalse(event.equals(AllEvent.ALLEVENT));
56+
assertNotEquals(event, new ActionExecutionEvent("action2"));
57+
assertNotEquals(event, AllEvent.ALLEVENT);
5858

5959
// hashcode
6060

‎xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/event/CancelableEventTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ void matchesEqualsHashcodeWhenDefaultConstructor()
7575
assertEquals(event, event);
7676
assertEquals(event, new TestCancelableEvent());
7777

78-
assertFalse(event.equals(new TestCancelableEvent("name")));
79-
assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name"))));
80-
assertFalse(event.equals(new TestCancelableEvent2()));
78+
assertNotEquals(event, new TestCancelableEvent("name"));
79+
assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
80+
assertNotEquals(event, new TestCancelableEvent2());
8181

8282
// hashcode
8383

8484
assertEquals(event.hashCode(), new TestCancelableEvent().hashCode());
85-
assertFalse(event.equals(new TestCancelableEvent2()));
85+
assertNotEquals(event, new TestCancelableEvent2());
8686

8787
assertNotEquals(event.hashCode(), new TestCancelableEvent("name").hashCode());
8888
assertNotEquals(event.hashCode(), new TestCancelableEvent(new FixedNameEventFilter("name")).hashCode());
@@ -106,14 +106,14 @@ void matchesEqualsHashcodeWhenNull()
106106
assertEquals(event, event);
107107
assertEquals(event, new TestCancelableEvent());
108108

109-
assertFalse(event.equals(new TestCancelableEvent("name")));
110-
assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name"))));
111-
assertFalse(event.equals(new TestCancelableEvent2()));
109+
assertNotEquals(event, new TestCancelableEvent("name"));
110+
assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
111+
assertNotEquals(event, new TestCancelableEvent2());
112112

113113
// hashcode
114114

115115
assertEquals(event.hashCode(), new TestCancelableEvent().hashCode());
116-
assertFalse(event.equals(new TestCancelableEvent2()));
116+
assertNotEquals(event, new TestCancelableEvent2());
117117

118118
assertNotEquals(event.hashCode(), new TestCancelableEvent("name").hashCode());
119119
assertNotEquals(event.hashCode(), new TestCancelableEvent(new FixedNameEventFilter("name")).hashCode());
@@ -140,10 +140,10 @@ void matchesEqualsHashcodeWhenFixedNameEvenFilterConstructor()
140140
assertEquals(event, new TestCancelableEvent("name"));
141141
assertEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
142142

143-
assertFalse(event.equals(null));
144-
assertFalse(event.equals(new TestCancelableEvent("name2")));
145-
assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name2"))));
146-
assertFalse(event.equals(new TestCancelableEvent2()));
143+
assertNotEquals(null, event);
144+
assertNotEquals(event, new TestCancelableEvent("name2"));
145+
assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name2")));
146+
assertNotEquals(event, new TestCancelableEvent2());
147147

148148
// hashcode
149149

@@ -175,10 +175,10 @@ void matchesEqualsHashcodeWhenStringConstructor()
175175
assertEquals(event, new TestCancelableEvent("name"));
176176
assertEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name")));
177177

178-
assertFalse(event.equals(null));
179-
assertFalse(event.equals(new TestCancelableEvent("name2")));
180-
assertFalse(event.equals(new TestCancelableEvent(new FixedNameEventFilter("name2"))));
181-
assertFalse(event.equals(new TestCancelableEvent2()));
178+
assertNotEquals(null, event);
179+
assertNotEquals(event, new TestCancelableEvent("name2"));
180+
assertNotEquals(event, new TestCancelableEvent(new FixedNameEventFilter("name2")));
181+
assertNotEquals(event, new TestCancelableEvent2());
182182

183183
// hashcode
184184

‎xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/AlwaysMatchingEventFilterTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.xwiki.observation.event.filter.FixedNameEventFilter;
2525

2626
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
import static org.junit.jupiter.api.Assertions.assertFalse;
27+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2828
import static org.junit.jupiter.api.Assertions.assertTrue;
2929

3030
/**
@@ -45,8 +45,8 @@ void testGetFilter()
4545
@Test
4646
void testEquals()
4747
{
48-
assertFalse(this.filter.equals(null));
49-
assertFalse(this.filter.equals(new FixedNameEventFilter("filter")));
48+
assertNotEquals(null, this.filter);
49+
assertNotEquals(this.filter, new FixedNameEventFilter("filter"));
5050

5151
assertEquals(this.filter, this.filter);
5252
}

‎xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-api/src/test/java/org/xwiki/observation/filter/FixedNameEventFilterTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.xwiki.observation.event.filter.FixedNameEventFilter;
2525

2626
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
import static org.junit.jupiter.api.Assertions.assertFalse;
27+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2828

2929
/**
3030
* Unit tests for {@link FixedNameEventFilter}.
@@ -38,9 +38,9 @@ void testFixedNameEventFilterTest()
3838
{
3939
FixedNameEventFilter filter = new FixedNameEventFilter("filter");
4040

41-
assertFalse(filter.equals(null));
42-
assertFalse(filter.equals(AlwaysMatchingEventFilter.INSTANCE));
43-
assertFalse(filter.equals(new FixedNameEventFilter("filter2")));
41+
assertNotEquals(null, filter);
42+
assertNotEquals(filter, AlwaysMatchingEventFilter.INSTANCE);
43+
assertNotEquals(filter, new FixedNameEventFilter("filter2"));
4444

4545
assertEquals(filter, filter);
4646
assertEquals(filter, new FixedNameEventFilter("filter"));

‎xwiki-commons-core/xwiki-commons-store/xwiki-commons-store-blob/xwiki-commons-store-blob-api/src/test/java/org/xwiki/store/blob/BlobRangeOptionTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import static org.junit.jupiter.api.Assertions.assertEquals;
2727
import static org.junit.jupiter.api.Assertions.assertFalse;
28+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2829
import static org.junit.jupiter.api.Assertions.assertThrows;
29-
import static org.junit.jupiter.api.Assertions.assertTrue;
3030

3131
/**
3232
* Tests for {@link BlobRangeOption}.
@@ -98,8 +98,8 @@ void equalsAndHashCode()
9898
BlobRangeOption second = BlobRangeOption.between(5, 9);
9999
BlobRangeOption different = BlobRangeOption.from(5);
100100

101-
assertTrue(first.equals(second));
101+
assertEquals(first, second);
102102
assertEquals(first.hashCode(), second.hashCode());
103-
assertFalse(first.equals(different));
103+
assertNotEquals(first, different);
104104
}
105105
}

0 commit comments

Comments
 (0)