From 7e89a247062bbf83460c7b921432cdfe20ec05e0 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 13 Oct 2018 10:19:48 +0300 Subject: [PATCH] [Test] CachingSupplier test to DataContainerTest --- .../store/containers/DataContainerTest.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/Plan/src/test/java/com/djrapitops/plan/data/store/containers/DataContainerTest.java b/Plan/src/test/java/com/djrapitops/plan/data/store/containers/DataContainerTest.java index 3f0a8c1b4..3c121c573 100644 --- a/Plan/src/test/java/com/djrapitops/plan/data/store/containers/DataContainerTest.java +++ b/Plan/src/test/java/com/djrapitops/plan/data/store/containers/DataContainerTest.java @@ -20,8 +20,6 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putSupplier(TEST_KEY, () -> "Success"); - // Test twice for CachingSupplier - assertEquals("Success", container.getUnsafe(TEST_KEY)); assertEquals("Success", container.getUnsafe(TEST_KEY)); } @@ -30,8 +28,6 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putSupplier(TEST_KEY, () -> "Success"); - // Test twice for CachingSupplier - assertEquals("Success", container.getUnsafe(TEST_KEY_COPY)); assertEquals("Success", container.getUnsafe(TEST_KEY_COPY)); } @@ -40,8 +36,6 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putRawData(TEST_KEY, "Success"); - // Test twice for CachingSupplier - assertEquals("Success", container.getUnsafe(TEST_KEY)); assertEquals("Success", container.getUnsafe(TEST_KEY)); } @@ -50,8 +44,6 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putRawData(TEST_KEY, "Success"); - // Test twice for CachingSupplier - assertEquals("Success", container.getUnsafe(TEST_KEY_COPY)); assertEquals("Success", container.getUnsafe(TEST_KEY_COPY)); } @@ -60,10 +52,8 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putRawData(TEST_KEY, null); - // Test twice for CachingSupplier assertTrue(container.supports(TEST_KEY)); assertNull(container.getUnsafe(TEST_KEY)); - assertNull(container.getUnsafe(TEST_KEY)); } @Test @@ -79,10 +69,27 @@ public class DataContainerTest { DataContainer container = new DataContainer(); container.putSupplier(TEST_KEY, () -> null); - // Test twice for CachingSupplier assertTrue(container.supports(TEST_KEY)); assertNull(container.getUnsafe(TEST_KEY)); - assertNull(container.getUnsafe(TEST_KEY)); + } + + @Test + public void cachingSupplier() { + DataContainer container = new DataContainer(); + String firstObj = "First"; + String secondObj = "Second"; + + assertNotSame(firstObj, secondObj); + + container.putCachingSupplier(TEST_KEY, () -> firstObj); + + String found = container.getUnsafe(TEST_KEY); + assertEquals(firstObj, found); + assertSame(firstObj, found); + assertNotSame(secondObj, found); + + String secondCall = container.getUnsafe(TEST_KEY); + assertSame(found, secondCall); } } \ No newline at end of file