Skip to content

Commit 64805bb

Browse files
committed
Fix whitespace issues
1 parent c2ffbfa commit 64805bb

File tree

2 files changed

+101
-1
lines changed

2 files changed

+101
-1
lines changed

src/main/java/seedu/address/model/person/AddressDiagnosisStatusPredicate.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,15 @@ public boolean equals(Object other) {
5757
AddressDiagnosisStatusPredicate otherAddressAndStatusPredicate =
5858
(AddressDiagnosisStatusPredicate) other;
5959
return address.equals(otherAddressAndStatusPredicate.address)
60+
&& disease.equals(otherAddressAndStatusPredicate.disease)
6061
&& status.equals(otherAddressAndStatusPredicate.status);
6162
}
6263

6364
@Override
6465
public String toString() {
6566
return new ToStringBuilder(this)
6667
.add("address", address)
68+
.add("disease", disease)
6769
.add("status", status)
6870
.toString();
6971
}
Lines changed: 99 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,100 @@
1-
package seedu.address.model.person;public class AddressDiagnosisStatusPredicateTest {
1+
package seedu.address.model.person;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertTrue;
6+
7+
import org.junit.jupiter.api.Test;
8+
9+
import seedu.address.testutil.PersonBuilder;
10+
11+
public class AddressDiagnosisStatusPredicateTest {
12+
13+
@Test
14+
public void equals() {
15+
String rightAddress = "Blk 123, Yishun Avenue 4, Singapore 567890";
16+
String rightDisease = "dengue";
17+
String rightStatus = "UNWELL";
18+
AddressDiagnosisStatusPredicate predicate =
19+
new AddressDiagnosisStatusPredicate(rightAddress, rightDisease, rightStatus);
20+
21+
// same object -> returns true
22+
assertTrue(predicate.equals(predicate));
23+
24+
// same values -> returns true
25+
AddressDiagnosisStatusPredicate predicateCopy =
26+
new AddressDiagnosisStatusPredicate(rightAddress, rightDisease, rightStatus);
27+
assertTrue(predicate.equals(predicateCopy));
28+
29+
// different types -> returns false
30+
assertFalse(predicate.equals(1));
31+
32+
// null -> returns false
33+
assertFalse(predicate.equals(null));
34+
35+
// different address -> returns false
36+
AddressDiagnosisStatusPredicate wrongPredicate = new AddressDiagnosisStatusPredicate(
37+
"Blk 321, Yishun Avenue 4, Singapore 987650", rightDisease, rightStatus);
38+
assertFalse(predicate.equals(wrongPredicate));
39+
40+
// different disease -> returns false
41+
wrongPredicate = new AddressDiagnosisStatusPredicate(rightAddress, "swine flu", rightStatus);
42+
assertFalse(predicate.equals(wrongPredicate));
43+
44+
// different status -> returns false
45+
wrongPredicate = new AddressDiagnosisStatusPredicate(rightAddress, rightDisease, "PENDING");
46+
assertFalse(predicate.equals(wrongPredicate));
47+
}
48+
49+
@Test
50+
public void test_containsKeywords_returnsTrue() {
51+
String address = "Blk 123, Yishun Avenue 4, Singapore 567890";
52+
String disease = "dengue fever";
53+
String status = "UNWELL";
54+
55+
// total address and disease match
56+
AddressDiagnosisStatusPredicate predicate =
57+
new AddressDiagnosisStatusPredicate(address, disease, status);
58+
Person person = new PersonBuilder().withAddress(address).withStatus(status).withDiagnosis(disease).build();
59+
assertTrue(predicate.test(person));
60+
61+
// partial address match, total disease match
62+
predicate = new AddressDiagnosisStatusPredicate("Yishun Avenue", disease, status);
63+
assertTrue(predicate.test(person));
64+
65+
// total address match, partial disease match
66+
predicate = new AddressDiagnosisStatusPredicate(address, "dengue", status);
67+
assertTrue(predicate.test(person));
68+
}
69+
70+
@Test
71+
public void test_doesNotContainKeywords_returnsFalse() {
72+
String address = "Blk 123, Yishun Avenue 4, Singapore 567890";
73+
String disease = "dengue fever";
74+
String status = "UNWELL";
75+
Person person = new PersonBuilder().withAddress(address).withStatus(status).withDiagnosis(disease).build();
76+
77+
// Non-matching address
78+
AddressDiagnosisStatusPredicate predicate = new AddressDiagnosisStatusPredicate(
79+
"Blk 10, Sengkang Drive 4, Singapore 192847", disease, status);
80+
assertFalse(predicate.test(person));
81+
82+
// Non-matching disease
83+
predicate = new AddressDiagnosisStatusPredicate(address, "swine flu", status);
84+
assertFalse(predicate.test(person));
85+
}
86+
87+
@Test
88+
public void toStringMethod() {
89+
String address = "Blk 123, Yishun Avenue 4, Singapore 567890";
90+
String disease = "dengue";
91+
String status = "UNWELL";
92+
AddressDiagnosisStatusPredicate predicate = new AddressDiagnosisStatusPredicate(address, disease, status);
93+
94+
String expected = AddressDiagnosisStatusPredicate.class.getCanonicalName()
95+
+ "{address=" + address + ", "
96+
+ "disease=" + disease + ", "
97+
+ "status=" + status + "}";
98+
assertEquals(expected, predicate.toString());
99+
}
2100
}

0 commit comments

Comments
 (0)