Change comparator test to fix order and wrong comparator usedd

AY2324S2-CS2103-F08-3 · Mar 17, 2024 · 2e6a443 · 2e6a443
1 parent 1f6d93b
commit 2e6a443
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/test/java/staffconnect/model/person/comparators/FacultyComparatorTest.java b/src/test/java/staffconnect/model/person/comparators/FacultyComparatorTest.java
@@ -17,10 +17,10 @@
 public class FacultyComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(VENUE_COMPARATOR, FACULTY_COMPARATOR);
-        assertNotEquals(VENUE_COMPARATOR, MODULE_COMPARATOR);
-        assertNotEquals(VENUE_COMPARATOR, NAME_COMPARATOR);
-        assertNotEquals(VENUE_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, NAME_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(FACULTY_COMPARATOR, VENUE_COMPARATOR);
     }
 
     @Test

diff --git a/src/test/java/staffconnect/model/person/comparators/ModuleComparatorTest.java b/src/test/java/staffconnect/model/person/comparators/ModuleComparatorTest.java
@@ -16,9 +16,9 @@
 public class ModuleComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(MODULE_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(MODULE_COMPARATOR, NAME_COMPARATOR);
         assertNotEquals(MODULE_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(MODULE_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(MODULE_COMPARATOR, VENUE_COMPARATOR);
     }
 

diff --git a/src/test/java/staffconnect/model/person/comparators/NameComparatorTest.java b/src/test/java/staffconnect/model/person/comparators/NameComparatorTest.java
@@ -18,9 +18,9 @@ public class NameComparatorTest {
 
     @Test
     public void doesNotEquals() {
-        assertNotEquals(NAME_COMPARATOR, FACULTY_COMPARATOR);
-        assertNotEquals(NAME_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(NAME_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(NAME_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(NAME_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(NAME_COMPARATOR, VENUE_COMPARATOR);
     }
 

diff --git a/src/test/java/staffconnect/model/person/comparators/PhoneComparatorTest.java b/src/test/java/staffconnect/model/person/comparators/PhoneComparatorTest.java
@@ -17,9 +17,9 @@
 public class PhoneComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(PHONE_COMPARATOR, FACULTY_COMPARATOR);
-        assertNotEquals(PHONE_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(PHONE_COMPARATOR, NAME_COMPARATOR);
+        assertNotEquals(PHONE_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(PHONE_COMPARATOR, FACULTY_COMPARATOR);
         assertNotEquals(PHONE_COMPARATOR, VENUE_COMPARATOR);
     }
 

diff --git a/src/test/java/staffconnect/model/person/comparators/VenueComparatorTest.java b/src/test/java/staffconnect/model/person/comparators/VenueComparatorTest.java
@@ -17,22 +17,22 @@
 public class VenueComparatorTest {
     @Test
     public void doesNotEquals() {
-        assertNotEquals(VENUE_COMPARATOR, FACULTY_COMPARATOR);
-        assertNotEquals(VENUE_COMPARATOR, MODULE_COMPARATOR);
         assertNotEquals(VENUE_COMPARATOR, NAME_COMPARATOR);
         assertNotEquals(VENUE_COMPARATOR, PHONE_COMPARATOR);
+        assertNotEquals(VENUE_COMPARATOR, MODULE_COMPARATOR);
+        assertNotEquals(VENUE_COMPARATOR, FACULTY_COMPARATOR);
     }
 
     @Test
     public void checkComparator() {
 
-        assertTrue(PHONE_COMPARATOR.compare(ELLE, CARL) <= -1); // michegan ave < wall street
-        assertTrue(PHONE_COMPARATOR.compare(CARL, ELLE) >= 1); // wall street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(ELLE, CARL) <= -1); // michegan ave < wall street
+        assertTrue(VENUE_COMPARATOR.compare(CARL, ELLE) >= 1); // wall street > michegan ave
 
-        assertTrue(PHONE_COMPARATOR.compare(ELLE, GEORGE) <= -1); // michegan ave < 4th street
-        assertTrue(PHONE_COMPARATOR.compare(GEORGE, ELLE) >= 1); //  4th street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(GEORGE, ELLE) <= 1); //  4th street > michegan ave
+        assertTrue(VENUE_COMPARATOR.compare(ELLE, GEORGE) >= -1); // michegan ave < 4th street
 
-        assertEquals(PHONE_COMPARATOR.compare(ELLE, ELLE), 0); // michegan ave = michegan ave
-        assertEquals(PHONE_COMPARATOR.compare(GEORGE, GEORGE), 0); // 4th street = 4th street
+        assertEquals(VENUE_COMPARATOR.compare(ELLE, ELLE), 0); // michegan ave = michegan ave
+        assertEquals(VENUE_COMPARATOR.compare(GEORGE, GEORGE), 0); // 4th street = 4th street
     }
 }