Skip to content

Commit e35bf2b

Browse files
author
pushkar
committed
Fixed build failure due to suboptimal expression in newly added tests
1 parent 2a9554a commit e35bf2b

File tree

6 files changed

+36
-18
lines changed

6 files changed

+36
-18
lines changed

src/test/java/com/thealgorithms/sorts/AdaptiveMergeSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,14 @@ public int compareTo(Person o) {
107107

108108
@Override
109109
public boolean equals(Object o) {
110-
if (!(o instanceof Person)) {
110+
if (this == o) {
111+
return true;
112+
}
113+
if (o == null || getClass() != o.getClass()) {
111114
return false;
112115
}
113-
Person p = (Person) o;
114-
return this.name.equals(p.name) && this.age == p.age;
116+
Person person = (Person) o;
117+
return age == person.age && Objects.equals(name, person.name);
115118
}
116119

117120
@Override

src/test/java/com/thealgorithms/sorts/BogoSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@ public int compareTo(Person o) {
116116

117117
@Override
118118
public boolean equals(Object o) {
119-
if (!(o instanceof Person)) {
119+
if (this == o) {
120+
return true;
121+
}
122+
if (o == null || getClass() != o.getClass()) {
120123
return false;
121124
}
122-
Person p = (Person) o;
123-
return this.name.equals(p.name) && this.age == p.age;
125+
Person person = (Person) o;
126+
return age == person.age && Objects.equals(name, person.name);
124127
}
125128

126129
@Override

src/test/java/com/thealgorithms/sorts/BubbleSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,14 @@ public int compareTo(Person o) {
144144

145145
@Override
146146
public boolean equals(Object o) {
147-
if (!(o instanceof Person)) {
147+
if (this == o) {
148+
return true;
149+
}
150+
if (o == null || getClass() != o.getClass()) {
148151
return false;
149152
}
150-
Person p = (Person) o;
151-
return this.name.equals(p.name) && this.age == p.age;
153+
Person person = (Person) o;
154+
return age == person.age && Objects.equals(name, person.name);
152155
}
153156

154157
@Override

src/test/java/com/thealgorithms/sorts/GnomeSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,14 @@ public int compareTo(Person o) {
137137

138138
@Override
139139
public boolean equals(Object o) {
140-
if (!(o instanceof Person)) {
140+
if (this == o) {
141+
return true;
142+
}
143+
if (o == null || getClass() != o.getClass()) {
141144
return false;
142145
}
143-
Person p = (Person) o;
144-
return this.name.equals(p.name) && this.age == p.age;
146+
Person person = (Person) o;
147+
return age == person.age && Objects.equals(name, person.name);
145148
}
146149

147150
@Override

src/test/java/com/thealgorithms/sorts/InsertionSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,14 @@ public int compareTo(Person o) {
164164

165165
@Override
166166
public boolean equals(Object o) {
167-
if (!(o instanceof Person)) {
167+
if (this == o) {
168+
return true;
169+
}
170+
if (o == null || getClass() != o.getClass()) {
168171
return false;
169172
}
170-
Person p = (Person) o;
171-
return this.name.equals(p.name) && this.age == p.age;
173+
Person person = (Person) o;
174+
return age == person.age && Objects.equals(name, person.name);
172175
}
173176

174177
@Override

src/test/java/com/thealgorithms/sorts/SlowSortTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,14 @@ public int compareTo(Person o) {
129129

130130
@Override
131131
public boolean equals(Object o) {
132-
if (!(o instanceof Person)) {
132+
if (this == o) {
133+
return true;
134+
}
135+
if (o == null || getClass() != o.getClass()) {
133136
return false;
134137
}
135-
Person p = (Person) o;
136-
return this.name.equals(p.name) && this.age == p.age;
138+
Person person = (Person) o;
139+
return age == person.age && Objects.equals(name, person.name);
137140
}
138141

139142
@Override

0 commit comments

Comments
 (0)