X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabaseTest.java;h=daa5e4d8fd9253629d138dfd95754e10502e53fe;hp=f7b07a215fc15e6fab8a6554cc09f25dedaefab1;hb=fafe0029dcbef27ce918fdf7007e78c8705ca20f;hpb=2524f4d47c56874a263f9e53ec5c4035f2baa7e0 diff --git a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java index f7b07a2..daa5e4d 100644 --- a/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java +++ b/src/test/java/net/pterodactylus/sone/database/memory/MemoryDatabaseTest.java @@ -1,5 +1,5 @@ /* - * Sone - MemoryDatabaseTest.java - Copyright © 2013 David Roden + * Sone - MemoryDatabaseTest.java - Copyright © 2013–2016 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,17 +20,18 @@ package net.pterodactylus.sone.database.memory; import static com.google.common.base.Optional.of; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static net.pterodactylus.sone.Matchers.isAlbum; -import static net.pterodactylus.sone.Matchers.isImage; -import static net.pterodactylus.sone.Matchers.isPost; -import static net.pterodactylus.sone.Matchers.isPostReply; +import static net.pterodactylus.sone.test.Matchers.isAlbum; +import static net.pterodactylus.sone.test.Matchers.isImage; +import static net.pterodactylus.sone.test.Matchers.isPost; +import static net.pterodactylus.sone.test.Matchers.isPostReply; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.emptyIterable; -import static org.mockito.Matchers.anyString; +import static org.hamcrest.Matchers.nullValue; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -44,17 +45,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.pterodactylus.sone.TestAlbumBuilder; -import net.pterodactylus.sone.TestImageBuilder; -import net.pterodactylus.sone.TestPostBuilder; -import net.pterodactylus.sone.TestPostReplyBuilder; -import net.pterodactylus.sone.TestValue; import net.pterodactylus.sone.data.Album; -import net.pterodactylus.sone.data.impl.AlbumImpl; import net.pterodactylus.sone.data.Image; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.data.impl.AlbumImpl; +import net.pterodactylus.sone.test.TestAlbumBuilder; +import net.pterodactylus.sone.test.TestImageBuilder; +import net.pterodactylus.sone.test.TestPostBuilder; +import net.pterodactylus.sone.test.TestPostReplyBuilder; +import net.pterodactylus.sone.test.TestValue; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.Value; @@ -131,7 +132,7 @@ public class MemoryDatabaseTest { .update(); Album secondAlbum = new TestAlbumBuilder().withId("album2").by( sone).build().modify().setTitle("album2").setDescription( - "album-description2").setAlbumImage("image1").update(); + "album-description2").update(); Album thirdAlbum = new TestAlbumBuilder().withId("album3").by( sone).build().modify().setTitle("album3").setDescription( "album-description3").update(); @@ -183,23 +184,19 @@ public class MemoryDatabaseTest { assertThat(memoryDatabase.getPost("post2").get(), isPost(secondPost.getId(), 2000L, "post2", of(RECIPIENT_ID))); assertThat(memoryDatabase.getPost("post3").isPresent(), is(false)); - assertThat(memoryDatabase.getPostReply("reply1").get(), + assertThat(memoryDatabase.getPostReply("reply1"), isPostReply("reply1", "post1", 3000L, "reply1")); - assertThat(memoryDatabase.getPostReply("reply2").get(), + assertThat(memoryDatabase.getPostReply("reply2"), isPostReply("reply2", "post2", 4000L, "reply2")); - assertThat(memoryDatabase.getPostReply("reply3").get(), + assertThat(memoryDatabase.getPostReply("reply3"), isPostReply("reply3", "post1", 5000L, "reply3")); - assertThat(memoryDatabase.getPostReply("reply4").isPresent(), - is(false)); + assertThat(memoryDatabase.getPostReply("reply4"), nullValue()); assertThat(memoryDatabase.getAlbum("album1").get(), - isAlbum("album1", null, "album1", "album-description1", - null)); + isAlbum("album1", null, "album1", "album-description1")); assertThat(memoryDatabase.getAlbum("album2").get(), - isAlbum("album2", null, "album2", "album-description2", - "image1")); + isAlbum("album2", null, "album2", "album-description2")); assertThat(memoryDatabase.getAlbum("album3").get(), - isAlbum("album3", "album1", "album3", "album-description3", - null)); + isAlbum("album3", "album1", "album3", "album-description3")); assertThat(memoryDatabase.getAlbum("album4").isPresent(), is(false)); assertThat(memoryDatabase.getImage("image1").get(), isImage("image1", 1000L, "KSK@image1", "image1", @@ -278,11 +275,11 @@ public class MemoryDatabaseTest { private void initializeFriends() { when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/0/ID")).thenReturn( - new TestValue("Friend1")); + TestValue.from("Friend1")); when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/1/ID")).thenReturn( - new TestValue("Friend2")); + TestValue.from("Friend2")); when(configuration.getStringValue("Sone/" + SONE_ID + "/Friends/2/ID")).thenReturn( - new TestValue(null)); + TestValue.from(null)); } @Test @@ -332,7 +329,7 @@ public class MemoryDatabaseTest { when(configuration.getStringValue(anyString())).thenAnswer(new Answer>() { @Override public Value answer(InvocationOnMock invocation) throws Throwable { - Value stringValue = new TestValue(null); + Value stringValue = TestValue.from(null); configurationValues.put((String) invocation.getArguments()[0], stringValue); return stringValue; } @@ -363,7 +360,7 @@ public class MemoryDatabaseTest { when(sone.isLocal()).thenReturn(true); memoryDatabase.addFriend(sone, "Friend1"); memoryDatabase.addFriend(sone, "Friend1"); - verify(configuration, times(2)).getStringValue(anyString()); + verify(configuration, times(3)).getStringValue(anyString()); } @Test @@ -380,9 +377,10 @@ public class MemoryDatabaseTest { @Test public void configurationIsNotWrittenWhenANonFriendIsRemoved() { + prepareConfigurationValues(); when(sone.isLocal()).thenReturn(true); memoryDatabase.removeFriend(sone, "Friend1"); - verify(configuration, never()).getStringValue(anyString()); + verify(configuration).getStringValue(anyString()); } }