From 8825f4b3cc6753d5f9587501932d565db8143c00 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Mon, 22 Aug 2022 22:24:36 +0200
Subject: [PATCH] Fixed tests and fixed failed tests

---
 src/main/java/com/alttd/datalock/Lock.java     | 12 ++++++++----
 src/test/java/com/alttd/datalock/LockTest.java |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/alttd/datalock/Lock.java b/src/main/java/com/alttd/datalock/Lock.java
index 59b0f6a..fa98630 100644
--- a/src/main/java/com/alttd/datalock/Lock.java
+++ b/src/main/java/com/alttd/datalock/Lock.java
@@ -25,13 +25,13 @@ public class Lock implements Comparable {
 
     @Override
     public final boolean equals(@Nullable Object o) {
-        if (this == o) {
+        Lock other = (Lock) o;
+        if (this == other) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (other == null || getClass() != other.getClass()) {
             return false;
         }
-        Lock other = (Lock) o;
         return data.equals(other.data) && serverHash == other.serverHash;
     }
 
@@ -43,6 +43,10 @@ public class Lock implements Comparable {
 
     @Override
     public int compareTo(@NotNull Object o) {
-        return ((Lock) o).data.compareTo(data);
+        Lock lock = (Lock) o;
+        int data = lock.data.compareTo(this.data);
+        if (data != 0)
+            return data;
+        return Integer.compare(lock.getServerHash(), getServerHash());
     }
 }
diff --git a/src/test/java/com/alttd/datalock/LockTest.java b/src/test/java/com/alttd/datalock/LockTest.java
index a5234fd..46b1b19 100644
--- a/src/test/java/com/alttd/datalock/LockTest.java
+++ b/src/test/java/com/alttd/datalock/LockTest.java
@@ -6,16 +6,16 @@ class LockTest {
 
     @org.junit.jupiter.api.Test
     void testEquals() {
-        assertEquals(new Lock(123, "test"), new Lock(123, "test"));
-        assertNotEquals(new Lock(123, "test1"), new Lock(123, "test2"));
-        assertEquals(new Lock(123, "test"), new Lock(-123, "test"));
+        assertTrue(new Lock(123, "test").equals(new Lock(123, "test")));
+        assertFalse(new Lock(123, "test1").equals(new Lock(123, "test2")));
+        assertFalse(new Lock(123, "test").equals(new Lock(-123, "test")));
     }
 
     @org.junit.jupiter.api.Test
     void testHashCode() {
         assertEquals(new Lock(123, "test").hashCode(), new Lock(123, "test").hashCode());
         assertNotEquals(new Lock(123, "test1").hashCode(), new Lock(123, "test2").hashCode());
-        assertEquals(new Lock(123, "test").hashCode(), new Lock(-123, "test").hashCode());
+        assertNotEquals(new Lock(123, "test").hashCode(), new Lock(-123, "test").hashCode());
     }
 
     @org.junit.jupiter.api.Test