From: David ‘Bombe’ Roden Date: Wed, 10 Jul 2019 06:22:50 +0000 (+0200) Subject: 🔀 Merge changes from other next branch X-Git-Tag: v81^2~200 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=04709e23f38e9d447337682ba27201da5dc19bd9;hp=6da6f5db556b861d573ec3337bdaea81aad17342 🔀 Merge changes from other next branch --- diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index f004cf2..2ff27c9 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -98,7 +98,6 @@ import net.pterodactylus.util.service.AbstractService; import net.pterodactylus.util.thread.NamedThreadFactory; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -1063,7 +1062,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, * The text of the post * @return The created post */ - public Post createPost(Sone sone, Optional recipient, String text) { + public Post createPost(Sone sone, @Nullable Sone recipient, String text) { checkNotNull(text, "text must not be null"); checkArgument(text.trim().length() > 0, "text must not be empty"); if (!sone.isLocal()) { @@ -1072,8 +1071,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } PostBuilder postBuilder = database.newPostBuilder(); postBuilder.from(sone.getId()).randomId().currentTime().withText(text.trim()); - if (recipient.isPresent()) { - postBuilder.to(recipient.get().getId()); + if (recipient != null) { + postBuilder.to(recipient.getId()); } final Post post = postBuilder.build(); database.storePost(post); diff --git a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java index 2c8456d..221ea7a 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java @@ -29,7 +29,7 @@ import freenet.support.SimpleFieldSet; /** * FCP command that creates a new {@link Post}. * - * @see Core#createPost(Sone, Optional, String) + * @see Core#createPost(Sone, Sone, String) */ public class CreatePostCommand extends AbstractSoneCommand { @@ -57,7 +57,7 @@ public class CreatePostCommand extends AbstractSoneCommand { if (sone.equals(recipient)) { return new ErrorResponse("Sone and Recipient must not be the same."); } - Post post = getCore().createPost(sone, Optional.fromNullable(recipient), text); + Post post = getCore().createPost(sone, recipient, text); return new Response("PostCreated", new SimpleFieldSetBuilder().put("Post", post.getId()).get()); } diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index e8aea1b..cf67c0b 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -782,7 +782,7 @@ public class WebInterface implements SessionProvider { */ @Subscribe public void newPostFound(NewPostFoundEvent newPostFoundEvent) { - Post post = newPostFoundEvent.post(); + Post post = newPostFoundEvent.getPost(); boolean isLocal = post.getSone().isLocal(); if (isLocal) { localPostNotification.add(post); @@ -808,7 +808,7 @@ public class WebInterface implements SessionProvider { */ @Subscribe public void newReplyFound(NewPostReplyFoundEvent newPostReplyFoundEvent) { - PostReply reply = newPostReplyFoundEvent.postReply(); + PostReply reply = newPostReplyFoundEvent.getPostReply(); boolean isLocal = reply.getSone().isLocal(); if (isLocal) { localReplyNotification.add(reply); @@ -854,7 +854,7 @@ public class WebInterface implements SessionProvider { @Subscribe public void postRemoved(PostRemovedEvent postRemovedEvent) { - removePost(postRemovedEvent.post()); + removePost(postRemovedEvent.getPost()); } private void removePost(Post post) { @@ -867,7 +867,7 @@ public class WebInterface implements SessionProvider { @Subscribe public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) { - removeReply(postReplyRemovedEvent.postReply()); + removeReply(postReplyRemovedEvent.getPostReply()); } private void removeReply(PostReply reply) { diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostFoundEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostFoundEvent.kt index ba7f957..83cb618 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostFoundEvent.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostFoundEvent.kt @@ -22,9 +22,4 @@ import net.pterodactylus.sone.data.Post /** * Event that signals that a new post was found. */ -data class NewPostFoundEvent(val post: Post) { - - @Deprecated(message = "will go away", replaceWith = ReplaceWith("post")) - fun post() = post - -} +data class NewPostFoundEvent(val post: Post) diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostReplyFoundEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostReplyFoundEvent.kt index a70d1b9..95cc3ee 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostReplyFoundEvent.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/event/NewPostReplyFoundEvent.kt @@ -22,9 +22,4 @@ import net.pterodactylus.sone.data.PostReply /** * Event that signals that a new [PostReply] was found. */ -data class NewPostReplyFoundEvent(val postReply: PostReply) { - - @Deprecated(message = "will go away", replaceWith = ReplaceWith("postReply")) - fun postReply() = postReply - -} +data class NewPostReplyFoundEvent(val postReply: PostReply) diff --git a/src/main/kotlin/net/pterodactylus/sone/core/event/PostRemovedEvent.kt b/src/main/kotlin/net/pterodactylus/sone/core/event/PostRemovedEvent.kt index 117d800..d4a3d4c 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/event/PostRemovedEvent.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/event/PostRemovedEvent.kt @@ -22,9 +22,4 @@ import net.pterodactylus.sone.data.Post /** * Event that signals that a [Post] was removed. */ -data class PostRemovedEvent(val post: Post) { - - @Deprecated(message = "will go away", replaceWith = ReplaceWith("post")) - fun post() = post - -} +data class PostRemovedEvent(val post: Post) diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt new file mode 100644 index 0000000..a3fe9be --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt @@ -0,0 +1,63 @@ +package net.pterodactylus.sone.main + +import com.google.common.base.* +import com.google.common.eventbus.* +import com.google.inject.* +import com.google.inject.matcher.* +import com.google.inject.name.Names.* +import com.google.inject.spi.* +import net.pterodactylus.sone.database.* +import net.pterodactylus.sone.database.memory.* +import net.pterodactylus.sone.freenet.wot.* +import net.pterodactylus.util.config.* +import net.pterodactylus.util.config.ConfigurationException +import net.pterodactylus.util.version.Version +import java.io.* + +class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() { + + override fun configure() { + val sonePropertiesFile = File("sone.properties") + val firstStart = !sonePropertiesFile.exists() + var newConfig = false + val configuration = try { + Configuration(MapConfigurationBackend(sonePropertiesFile, false)) + } catch (ce: ConfigurationException) { + sonePropertiesFile.delete() + newConfig = true + Configuration(MapConfigurationBackend(sonePropertiesFile, true)) + } + val context = Context("Sone") + val loaders = configuration.getStringValue("Developer.LoadFromFilesystem") + .getValue(null) + ?.let { + configuration.getStringValue("Developer.FilesystemPath") + .getValue(null) + ?.let { DebugLoaders(it) } + } + val eventBus = EventBus() + + bind(Configuration::class.java).toInstance(configuration) + bind(EventBus::class.java).toInstance(eventBus) + bind(Boolean::class.java).annotatedWith(named("FirstStart")).toInstance(firstStart) + bind(Boolean::class.java).annotatedWith(named("NewConfig")).toInstance(newConfig) + bind(Context::class.java).toInstance(context) + bind(object : TypeLiteral>() {}).toInstance(Optional.of(context)) + bind(SonePlugin::class.java).toInstance(sonePlugin) + bind(Version::class.java).toInstance(sonePlugin.version.parseVersion()) + bind(PluginVersion::class.java).toInstance(PluginVersion(sonePlugin.version)) + bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year)) + bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage)) + bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java) + loaders?.let { bind(Loaders::class.java).toInstance(it) } + + bindListener(Matchers.any(), object : TypeListener { + override fun hear(typeLiteral: TypeLiteral, typeEncounter: TypeEncounter) { + typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) }) + } + }) + } + +} + +private fun String.parseVersion(): Version = Version.parse(this) diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModuleCreator.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModuleCreator.kt deleted file mode 100644 index 58c8d9e..0000000 --- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModuleCreator.kt +++ /dev/null @@ -1,65 +0,0 @@ -package net.pterodactylus.sone.main - -import com.google.common.base.* -import com.google.common.eventbus.* -import com.google.inject.* -import com.google.inject.matcher.* -import com.google.inject.name.Names.* -import com.google.inject.spi.* -import net.pterodactylus.sone.database.* -import net.pterodactylus.sone.database.memory.* -import net.pterodactylus.sone.freenet.wot.* -import net.pterodactylus.util.config.* -import net.pterodactylus.util.config.ConfigurationException -import net.pterodactylus.util.version.Version -import java.io.* - -class SoneModuleCreator { - - fun createModule(sonePlugin: SonePlugin) = object : AbstractModule() { - override fun configure() { - val sonePropertiesFile = File("sone.properties") - val firstStart = !sonePropertiesFile.exists() - var newConfig = false - val configuration = try { - Configuration(MapConfigurationBackend(sonePropertiesFile, false)) - } catch (ce: ConfigurationException) { - sonePropertiesFile.delete() - newConfig = true - Configuration(MapConfigurationBackend(sonePropertiesFile, true)) - } - val context = Context("Sone") - val loaders = configuration.getStringValue("Developer.LoadFromFilesystem") - .getValue(null) - ?.let { - configuration.getStringValue("Developer.FilesystemPath") - .getValue(null) - ?.let { DebugLoaders(it) } - } - val eventBus = EventBus() - - bind(Configuration::class.java).toInstance(configuration) - bind(EventBus::class.java).toInstance(eventBus) - bind(Boolean::class.java).annotatedWith(named("FirstStart")).toInstance(firstStart) - bind(Boolean::class.java).annotatedWith(named("NewConfig")).toInstance(newConfig) - bind(Context::class.java).toInstance(context) - bind(object : TypeLiteral>() {}).toInstance(Optional.of(context)) - bind(SonePlugin::class.java).toInstance(sonePlugin) - bind(Version::class.java).toInstance(sonePlugin.version.parseVersion()) - bind(PluginVersion::class.java).toInstance(PluginVersion(sonePlugin.version)) - bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year)) - bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage)) - bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java) - loaders?.let { bind(Loaders::class.java).toInstance(it) } - - bindListener(Matchers.any(), object : TypeListener { - override fun hear(typeLiteral: TypeLiteral, typeEncounter: TypeEncounter) { - typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) }) - } - }) - } - } - -} - -private fun String.parseVersion(): Version = Version.parse(this) diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt index 79e66ad..28af3e3 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt @@ -19,7 +19,7 @@ class CreatePostAjaxPage @Inject constructor(webInterface: WebInterface) : Logge ?.let { text -> val sender = request.parameters["sender"].emptyToNull?.let(core::getSone) ?: currentSone val recipient = request.parameters["recipient"]?.let(core::getSone) - core.createPost(sender, recipient.asOptional(), text).let { post -> + core.createPost(sender, recipient, text).let { post -> createSuccessJsonObject().apply { put("postId", post.id) put("sone", sender.id) diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt index b47c2b1..2f8e054 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt @@ -28,7 +28,7 @@ class CreatePostPage @Inject constructor(webInterface: WebInterface, loaders: Lo } val sender = soneRequest.core.getLocalSone(soneRequest.httpRequest.getPartAsStringFailsafe("sender", 43)) ?: currentSone val recipient = soneRequest.core.getSone(soneRequest.httpRequest.getPartAsStringFailsafe("recipient", 43)) - soneRequest.core.createPost(sender, recipient.asOptional(), TextFilter.filter(soneRequest.httpRequest.getHeader("Host"), text)) + soneRequest.core.createPost(sender, recipient, TextFilter.filter(soneRequest.httpRequest.getHeader("Host"), text)) throw RedirectException(returnPage) } } diff --git a/src/test/java/net/pterodactylus/sone/core/CoreTest.java b/src/test/java/net/pterodactylus/sone/core/CoreTest.java index 903cba0..85f981c 100644 --- a/src/test/java/net/pterodactylus/sone/core/CoreTest.java +++ b/src/test/java/net/pterodactylus/sone/core/CoreTest.java @@ -100,8 +100,8 @@ public class CoreTest { mismatchDescription.appendText("is not PostRemovedEvent"); return false; } - if (((PostRemovedEvent) item).post() != post) { - mismatchDescription.appendText("post is ").appendValue(((PostRemovedEvent) item).post()); + if (((PostRemovedEvent) item).getPost() != post) { + mismatchDescription.appendText("post is ").appendValue(((PostRemovedEvent) item).getPost()); return false; } return true; diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt index 29db41c..cfbda94 100644 --- a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt @@ -56,7 +56,7 @@ class CreatePostCommandTest : SoneCommandTest() { parameters += "Text" to "Test" whenever(core.getSone("LocalSoneId")).thenReturn(localSone) val post = mock().apply { whenever(id).thenReturn("PostId") } - whenever(core.createPost(localSone, absent(), "Test")).thenReturn(post) + whenever(core.createPost(localSone, null, "Test")).thenReturn(post) val response = command.execute(parameters) assertThat(response.replyParameters.get("Message"), equalTo("PostCreated")) assertThat(response.replyParameters.get("Post"), equalTo("PostId")) @@ -90,7 +90,7 @@ class CreatePostCommandTest : SoneCommandTest() { whenever(core.getSone("LocalSoneId")).thenReturn(localSone) whenever(core.getSone("RemoteSoneId")).thenReturn(remoteSone) val post = mock().apply { whenever(id).thenReturn("PostId") } - whenever(core.createPost(localSone, of(remoteSone), "Test")).thenReturn(post) + whenever(core.createPost(localSone, remoteSone, "Test")).thenReturn(post) val response = command.execute(parameters) assertThat(response.replyParameters.get("Message"), equalTo("PostCreated")) assertThat(response.replyParameters.get("Post"), equalTo("PostId")) diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleCreatorTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleCreatorTest.kt deleted file mode 100644 index 0286032..0000000 --- a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleCreatorTest.kt +++ /dev/null @@ -1,176 +0,0 @@ -package net.pterodactylus.sone.main - -import com.google.common.base.* -import com.google.common.eventbus.* -import com.google.inject.* -import com.google.inject.name.Names.* -import net.pterodactylus.sone.database.* -import net.pterodactylus.sone.database.memory.* -import net.pterodactylus.sone.freenet.wot.* -import net.pterodactylus.sone.test.* -import net.pterodactylus.util.config.* -import net.pterodactylus.util.version.Version -import org.hamcrest.MatcherAssert.* -import org.hamcrest.Matchers.* -import org.junit.* -import java.io.* -import java.util.concurrent.atomic.* - -class SoneModuleCreatorTest { - - private val currentDir: File = File(".") - private val pluginVersion = Version("", 0, 1, 2) - private val pluginYear = 2019 - private val pluginHomepage = "home://page" - private val sonePlugin = mock().apply { - whenever(version).thenReturn(pluginVersion.toString()) - whenever(year).thenReturn(pluginYear) - whenever(homepage).thenReturn(pluginHomepage) - } - - @After - fun removePropertiesFromCurrentDirectory() { - File(currentDir, "sone.properties").delete() - } - - @Test - fun `creator binds configuration when no file is present`() { - File(currentDir, "sone.properties").delete() - assertThat(getInstance(), notNullValue()) - } - - @Test - fun `creator binds first start to true when no file is present`() { - File(currentDir, "sone.properties").delete() - assertThat(getInstance(named("FirstStart")), equalTo(true)) - } - - @Test - fun `config file is created in current directory if not present`() { - File(currentDir, "sone.properties").delete() - val configuration = getInstance() - configuration.save() - assertThat(File(currentDir, "sone.properties").exists(), equalTo(true)) - } - - @Test - fun `creator binds configuration when file is present`() { - File(currentDir, "sone.properties").writeText("Option=old") - assertThat(getInstance().getStringValue("Option").value, equalTo("old")) - } - - @Test - fun `creator binds first start to false when file is present`() { - File(currentDir, "sone.properties").writeText("Option=old") - assertThat(getInstance(named("FirstStart")), equalTo(false)) - } - - @Test - fun `invalid config file leads to new config being created`() { - File(currentDir, "sone.properties").writeText("Option=old\nbroken") - val configuration = getInstance() - assertThat(configuration.getStringValue("Option").getValue(null), nullValue()) - } - - @Test - fun `invalid config file leads to new config being set to true`() { - File(currentDir, "sone.properties").writeText("Option=old\nbroken") - assertThat(getInstance(named("NewConfig")), equalTo(true)) - } - - @Test - fun `valid config file leads to new config being set to false`() { - File(currentDir, "sone.properties").writeText("Option=old") - assertThat(getInstance(named("NewConfig")), equalTo(false)) - } - - @Test - fun `event bus is bound`() { - assertThat(getInstance(), notNullValue()) - } - - @Test - fun `context is bound`() { - assertThat(getInstance().context, equalTo("Sone")) - } - - @Test - fun `optional context is bound`() { - assertThat(getInstance>().get().context, equalTo("Sone")) - } - - @Test - fun `sone plugin is bound`() { - assertThat(getInstance(), sameInstance(sonePlugin)) - } - - @Test - fun `version is bound`() { - assertThat(getInstance(), equalTo(pluginVersion)) - } - - @Test - fun `plugin version is bound`() { - assertThat(getInstance(), equalTo(PluginVersion(pluginVersion.toString()))) - } - - @Test - fun `plugin year is bound`() { - assertThat(getInstance(), equalTo(PluginYear(pluginYear))) - } - - @Test - fun `plugin homepage in bound`() { - assertThat(getInstance(), equalTo(PluginHomepage(pluginHomepage))) - } - - @Test - fun `database is bound correctly`() { - assertThat(getInstance(), instanceOf(MemoryDatabase::class.java)) - } - - @Test - fun `default loader is used without dev options`() { - assertThat(getInstance(), instanceOf(DefaultLoaders::class.java)) - } - - @Test - fun `default loaders are used if no path is given`() { - File(currentDir, "sone.properties").writeText("Developer.LoadFromFilesystem=true") - assertThat(getInstance(), instanceOf(DefaultLoaders::class.java)) - } - - @Test - fun `debug loaders are used if path is given`() { - File(currentDir, "sone.properties").writeText("Developer.LoadFromFilesystem=true\nDeveloper.FilesystemPath=/tmp") - assertThat(getInstance(), instanceOf(DebugLoaders::class.java)) - } - - class TestObject { - val ref: AtomicReference = AtomicReference() - @Subscribe - fun testEvent(event: Any?) { - ref.set(event) - } - } - - @Test - fun `created objects are registered with event bus`() { - val injector = createInjector() - val eventBus: EventBus = getInstance(injector = injector) - val testObject = getInstance(injector = injector) - val event = Any() - eventBus.post(event) - assertThat(testObject.ref.get(), sameInstance(event)) - } - - private fun createInjector(): Injector = SoneModuleCreator() - .createModule(sonePlugin) - .let { Guice.createInjector(it) } - - private inline fun getInstance(annotation: Annotation? = null, injector: Injector = createInjector()): R = - annotation - ?.let { injector.getInstance(Key.get(object : TypeLiteral() {}, it)) } - ?: injector.getInstance(Key.get(object : TypeLiteral() {})) - -} diff --git a/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt new file mode 100644 index 0000000..83d3535 --- /dev/null +++ b/src/test/kotlin/net/pterodactylus/sone/main/SoneModuleTest.kt @@ -0,0 +1,168 @@ +package net.pterodactylus.sone.main + +import com.google.common.base.* +import com.google.common.eventbus.* +import com.google.inject.Guice.* +import com.google.inject.name.Names.* +import net.pterodactylus.sone.database.* +import net.pterodactylus.sone.database.memory.* +import net.pterodactylus.sone.freenet.wot.* +import net.pterodactylus.sone.test.* +import net.pterodactylus.util.config.* +import net.pterodactylus.util.version.Version +import org.hamcrest.MatcherAssert.* +import org.hamcrest.Matchers.* +import org.junit.* +import java.io.* +import java.util.concurrent.atomic.* + +class SoneModuleTest { + + private val currentDir: File = File(".") + private val pluginVersion = Version("", 0, 1, 2) + private val pluginYear = 2019 + private val pluginHomepage = "home://page" + private val sonePlugin = mock().apply { + whenever(version).thenReturn(pluginVersion.toString()) + whenever(year).thenReturn(pluginYear) + whenever(homepage).thenReturn(pluginHomepage) + } + + private val injector by lazy { createInjector(SoneModule(sonePlugin)) } + + @After + fun removePropertiesFromCurrentDirectory() { + File(currentDir, "sone.properties").delete() + } + + @Test + fun `creator binds configuration when no file is present`() { + File(currentDir, "sone.properties").delete() + assertThat(injector.getInstance(), notNullValue()) + } + + @Test + fun `creator binds first start to true when no file is present`() { + File(currentDir, "sone.properties").delete() + assertThat(injector.getInstance(named("FirstStart")), equalTo(true)) + } + + @Test + fun `config file is created in current directory if not present`() { + File(currentDir, "sone.properties").delete() + val configuration = injector.getInstance() + configuration.save() + assertThat(File(currentDir, "sone.properties").exists(), equalTo(true)) + } + + @Test + fun `creator binds configuration when file is present`() { + File(currentDir, "sone.properties").writeText("Option=old") + assertThat(injector.getInstance().getStringValue("Option").value, equalTo("old")) + } + + @Test + fun `creator binds first start to false when file is present`() { + File(currentDir, "sone.properties").writeText("Option=old") + assertThat(injector.getInstance(named("FirstStart")), equalTo(false)) + } + + @Test + fun `invalid config file leads to new config being created`() { + File(currentDir, "sone.properties").writeText("Option=old\nbroken") + val configuration = injector.getInstance() + assertThat(configuration.getStringValue("Option").getValue(null), nullValue()) + } + + @Test + fun `invalid config file leads to new config being set to true`() { + File(currentDir, "sone.properties").writeText("Option=old\nbroken") + assertThat(injector.getInstance(named("NewConfig")), equalTo(true)) + } + + @Test + fun `valid config file leads to new config being set to false`() { + File(currentDir, "sone.properties").writeText("Option=old") + assertThat(injector.getInstance(named("NewConfig")), equalTo(false)) + } + + @Test + fun `event bus is bound`() { + assertThat(injector.getInstance(), notNullValue()) + } + + @Test + fun `context is bound`() { + assertThat(injector.getInstance().context, equalTo("Sone")) + } + + @Test + fun `optional context is bound`() { + assertThat(injector.getInstance>().get().context, equalTo("Sone")) + } + + @Test + fun `sone plugin is bound`() { + assertThat(injector.getInstance(), sameInstance(sonePlugin)) + } + + @Test + fun `version is bound`() { + assertThat(injector.getInstance(), equalTo(pluginVersion)) + } + + @Test + fun `plugin version is bound`() { + assertThat(injector.getInstance(), equalTo(PluginVersion(pluginVersion.toString()))) + } + + @Test + fun `plugin year is bound`() { + assertThat(injector.getInstance(), equalTo(PluginYear(pluginYear))) + } + + @Test + fun `plugin homepage in bound`() { + assertThat(injector.getInstance(), equalTo(PluginHomepage(pluginHomepage))) + } + + @Test + fun `database is bound correctly`() { + assertThat(injector.getInstance(), instanceOf(MemoryDatabase::class.java)) + } + + @Test + fun `default loader is used without dev options`() { + assertThat(injector.getInstance(), instanceOf(DefaultLoaders::class.java)) + } + + @Test + fun `default loaders are used if no path is given`() { + File(currentDir, "sone.properties").writeText("Developer.LoadFromFilesystem=true") + assertThat(injector.getInstance(), instanceOf(DefaultLoaders::class.java)) + } + + @Test + fun `debug loaders are used if path is given`() { + File(currentDir, "sone.properties").writeText("Developer.LoadFromFilesystem=true\nDeveloper.FilesystemPath=/tmp") + assertThat(injector.getInstance(), instanceOf(DebugLoaders::class.java)) + } + + class TestObject { + val ref: AtomicReference = AtomicReference() + @Subscribe + fun testEvent(event: Any?) { + ref.set(event) + } + } + + @Test + fun `created objects are registered with event bus`() { + val eventBus: EventBus = injector.getInstance() + val testObject = injector.getInstance() + val event = Any() + eventBus.post(event) + assertThat(testObject.ref.get(), sameInstance(event)) + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt index 2fc4a96..c8f2417 100644 --- a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt +++ b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt @@ -1,11 +1,10 @@ package net.pterodactylus.sone.test -import com.google.inject.Injector -import com.google.inject.Module +import com.google.inject.* import com.google.inject.name.* import org.mockito.* import javax.inject.Provider -import kotlin.reflect.KClass +import kotlin.reflect.* fun KClass.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider(Provider { instance }) } fun KClass.withNameIsProvidedBy(instance: T, name: String) = Module { it.bind(this.java).annotatedWith(Names.named(name)).toProvider(Provider { instance }) } @@ -14,7 +13,9 @@ fun KClass.isProvidedBy(provider: KClass>) = Module inline fun KClass.isProvidedByMock() = Module { it.bind(this.java).toProvider(Provider { mock() }) } inline fun KClass.isProvidedByDeepMock() = Module { it.bind(this.java).toProvider(Provider { deepMock() }) } -inline fun Injector.getInstance() = getInstance(T::class.java)!! +inline fun Injector.getInstance(annotation: Annotation? = null): T = annotation + ?.let { getInstance(Key.get(object : TypeLiteral() {}, it)) } + ?: getInstance(Key.get(object : TypeLiteral() {})) fun supply(javaClass: Class): Source = object : Source { override fun fromInstance(instance: T) = Module { it.bind(javaClass).toInstance(instance) } diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt index 821198f..b79e6df 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt @@ -40,7 +40,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: fun `request with valid data creates post`() { addRequestParameter("text", "test") val post = createPost() - whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post) + whenever(core.createPost(currentSone, null, "test")).thenReturn(post) assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) @@ -52,7 +52,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addRequestParameter("text", "test") addRequestParameter("recipient", "invalid") val post = createPost() - whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post) + whenever(core.createPost(currentSone, null, "test")).thenReturn(post) assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) @@ -66,7 +66,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: val recipient = mock().apply { whenever(id).thenReturn("valid") } addSone(recipient) val post = createPost("valid") - whenever(core.createPost(currentSone, Optional.of(recipient), "test")).thenReturn(post) + whenever(core.createPost(currentSone, recipient, "test")).thenReturn(post) assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) @@ -78,7 +78,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addRequestParameter("text", "Link http://freenet.test:8888/KSK@foo is filtered") addRequestHeader("Host", "freenet.test:8888") val post = createPost() - whenever(core.createPost(currentSone, Optional.absent(), "Link KSK@foo is filtered")).thenReturn(post) + whenever(core.createPost(currentSone, null, "Link KSK@foo is filtered")).thenReturn(post) assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt index 2bf0c05..6212c90 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt @@ -40,7 +40,7 @@ class CreatePostPageTest : WebPageTest(::CreatePostPage) { addHttpRequestPart("returnPage", "return.html") addHttpRequestPart("text", "post text") verifyRedirect("return.html") { - verify(core).createPost(currentSone, absent(), "post text") + verify(core).createPost(currentSone, null, "post text") } } @@ -62,7 +62,7 @@ class CreatePostPageTest : WebPageTest(::CreatePostPage) { val sender = mock() addLocalSone("sender-id", sender) verifyRedirect("return.html") { - verify(core).createPost(sender, absent(), "post text") + verify(core).createPost(sender, null, "post text") } } @@ -75,7 +75,7 @@ class CreatePostPageTest : WebPageTest(::CreatePostPage) { val recipient = mock() addSone("recipient-id", recipient) verifyRedirect("return.html") { - verify(core).createPost(currentSone, recipient.asOptional(), "post text") + verify(core).createPost(currentSone, recipient, "post text") } } @@ -86,7 +86,7 @@ class CreatePostPageTest : WebPageTest(::CreatePostPage) { addHttpRequestPart("text", "post http://localhost:12345/KSK@foo text") addHttpRequestHeader("Host", "localhost:12345") verifyRedirect("return.html") { - verify(core).createPost(currentSone, absent(), "post KSK@foo text") + verify(core).createPost(currentSone, null, "post KSK@foo text") } }