1. Strings #8 (#104)

fungover · Feb 15, 2023 · 18b083f · 18b083f
2 parents 618fcfd + d47f62e
commit 18b083f
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 67 deletions.
diff --git a/src/main/java/org/fungover/haze/HazeDatabase.java b/src/main/java/org/fungover/haze/HazeDatabase.java
@@ -7,70 +7,77 @@
 
 public class HazeDatabase {
 
-	private Map<String, String> database;
-	private Lock lock;
+    private Map<String, String> database;
+    private Lock lock;
 
-	public HazeDatabase() {
-		this.database = new HashMap<>();
-		this.lock = new ReentrantLock();
-	}
+    public HazeDatabase() {
+        this.database = new HashMap<>();
+        this.lock = new ReentrantLock();
+    }
+    public String set(String key, String value) {
+        lock.lock();
+        try {
+            //add code for setting value when when key exists
+            database.put(key, value);
 
+        } finally {
+            lock.unlock();
+        }
+        return "+OK\r\n";
+    }
 
-	public String set(String key, String value) {
-		lock.lock();
-		try {
-			//add code for setting value when when key exists
-		} finally {
-			lock.unlock();
-		}
-		return "";
-	}
+    public String get(String key) {
+        lock.lock();
+        try {
+            //return value when key is passed
+            if (database.containsKey(key)) {
+                return getString(key);
+            }
+        } finally {
+            lock.unlock();
+        }
+        return "$-1\r\n";
+    }
+    public String getString(String key) {
+        return "$" + database.get(key).length() + "\r\n" + database.get(key) + "\r\n";
+    }
 
-	public String get(String key) {
-		lock.lock();
-		try {
-			//return value when key is passed
-		} finally {
-			lock.unlock();
-		}
-		return "";
-	}
 
-	public String delete(String key) {
-		lock.lock();
-		try {
-			//remove key when it is passed, ignores if there is no key
-		} finally {
-			lock.unlock();
+    public String delete(String key) {
+        lock.lock();
+        try {
+            //remove key when it is passed, ignores if there is no key
+        } finally {
+            lock.unlock();
 
-		}
-		return "";
-	}
+        }
+        return "";
+    }
 
-	public String exists(String key) {
-		lock.lock();
-		try {
-			//gets key as parameter and returns an integer representing how many keys exists
-		} finally {
-			lock.unlock();
+    public String exists(String key) {
+        lock.lock();
+        try {
+            //gets key as parameter and returns an integer representing how many keys exists
+        } finally {
+            lock.unlock();
 
-		}
-		return "";
-	}
+        }
+        return "";
+    }
 
-	public String setNX(String key, String value) {
-		String replyWhenKeyNotSet = ":0\r\n";
-		String replyWhenKeySet = ":1\r\n";
-		lock.lock();
-		try {
-			if(database.containsKey(key))
-				return replyWhenKeyNotSet;
-			else{
-				database.put(key, value);
-				return replyWhenKeySet;
-			}
-		} finally {
-			lock.unlock();
-		}
-	}
+    public String setNX(String key, String value) {
+        String replyWhenKeyNotSet = ":0\r\n";
+        String replyWhenKeySet = ":1\r\n";
+        lock.lock();
+        try {
+            if (database.containsKey(key))
+                return replyWhenKeyNotSet;
+            else {
+                database.put(key, value);
+                return replyWhenKeySet;
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
 }
diff --git a/src/test/java/org/fungover/haze/HazeDatabaseTest.java b/src/test/java/org/fungover/haze/HazeDatabaseTest.java
@@ -3,19 +3,69 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class HazeDatabaseTest {
 
-	HazeDatabase testDatabase = new HazeDatabase();
+    HazeDatabase testDatabase = new HazeDatabase();
 
-	@Test
-	void testSetNxReturnZeroWhenExistingKeyAreUsedWithDifferentValue() {
-		testDatabase.setNX("1", "Hej");
-		assertThat(testDatabase.setNX("1", "Då")).isEqualTo(":0\r\n");
-	}
+    @Test
+    void testSetNxReturnZeroWhenExistingKeyAreUsedWithDifferentValue() {
+        testDatabase.setNX("1", "Hej");
+        assertThat(testDatabase.setNX("1", "Då")).isEqualTo(":0\r\n");
+    }
 
-	@Test
-	void testSetNxReturnOneWhenKeyDontExist() {
-		assertThat(testDatabase.setNX("2", "Då")).isEqualTo(":1\r\n");
-	}
+    @Test
+    void testSetNxReturnOneWhenKeyDontExist() {
+        assertThat(testDatabase.setNX("2", "Då")).isEqualTo(":1\r\n");
+    }
+
+    @Test
+    void testSetWithValidKeyValuePair() {
+        String result = testDatabase.set("key", "value");
+        assertEquals("+OK\r\n", result);
+    }
+
+    @Test
+    void testSetWithNullValue() {
+        String result = testDatabase.set("key", null);
+        assertEquals("+OK\r\n", result);
+    }
+
+    @Test
+    void testGetWithValidKey() {
+        testDatabase.set("key", "value");
+        String result = testDatabase.get("key");
+        assertEquals("$5\r\nvalue\r\n", result);
+    }
+
+    @Test
+    void testGetWithInvalidKey() {
+        String result = testDatabase.get("invalidKey");
+        assertEquals("$-1\r\n", result);
+    }
+
+    @Test
+    void testGetWithNullKey() {
+        String result = testDatabase.get(null);
+        assertEquals("$-1\r\n", result);
+    }
+
+    @Test
+    void testGetStringWithValidKey() {
+        testDatabase.set("key", "value");
+        String result = testDatabase.getString("key");
+        assertEquals("$5\r\nvalue\r\n", result);
+    }
+
+    @Test
+    void testGetStringWithNullKey() {
+        try {
+            testDatabase.getString(null);
+            fail();
+        } catch (NullPointerException npe) {
+
+        }
+    }
 }