From dccd8445e6e76dcfe70d39eca14ab98558005c16 Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 6 Nov 2012 11:23:57 +0000 Subject: [PATCH] More changes to finish first test in UpdateBehaviors --- .../i2p/router/update/DummyHandlerSpec.scala | 18 +++++++++++++++++- .../i2p/router/update/NewsHandlerSpec.scala | 18 +++++++++++++++++- .../update/PluginUpdateHandlerSpec.scala | 18 +++++++++++++++++- .../update/UnsignedUpdateHandlerSpec.scala | 6 +++--- .../i2p/router/update/UpdateHandlerSpec.scala | 18 +++++++++++++++++- .../i2p/router/update/UpdaterBehaviors.scala | 14 ++++++++------ 6 files changed, 79 insertions(+), 13 deletions(-) diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/DummyHandlerSpec.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/DummyHandlerSpec.scala index 412411929..92c2349ad 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/DummyHandlerSpec.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/DummyHandlerSpec.scala @@ -3,7 +3,11 @@ package net.i2p.router.update import org.scalatest.FunSpec import org.scalatest.mock.MockitoSugar +import java.util.ArrayList + import net.i2p.router.RouterContext +import net.i2p.update.UpdateMethod +import net.i2p.update.UpdateType /** * @author str4d @@ -16,9 +20,21 @@ class DummyHandlerSpec extends FunSpec with CheckerBehaviors with UpdaterBehavio dh } + def validTypes = { + val vt = new ArrayList[UpdateType] + vt.add(UpdateType.ROUTER_UNSIGNED) + vt + } + + def validMethods = { + val vm = new ArrayList[UpdateMethod] + vm.add(UpdateMethod.HTTP) + vm + } + describe("A DummyHandler") { it should behave like checker(dummyHandler) - it should behave like updater(dummyHandler) + it should behave like updater(dummyHandler, validTypes, validMethods) } } diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/NewsHandlerSpec.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/NewsHandlerSpec.scala index 03867b38c..a8144c5fc 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/NewsHandlerSpec.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/NewsHandlerSpec.scala @@ -3,7 +3,11 @@ package net.i2p.router.update import org.scalatest.FunSpec import org.scalatest.mock.MockitoSugar +import java.util.ArrayList + import net.i2p.router.RouterContext +import net.i2p.update.UpdateMethod +import net.i2p.update.UpdateType /** * @author str4d @@ -16,7 +20,19 @@ class NewsHandlerSpec extends FunSpec with UpdaterBehaviors with MockitoSugar { nh } + def validTypes = { + val vt = new ArrayList[UpdateType] + vt.add(UpdateType.ROUTER_UNSIGNED) + vt + } + + def validMethods = { + val vm = new ArrayList[UpdateMethod] + vm.add(UpdateMethod.HTTP) + vm + } + describe("A NewsHandler") { - it should behave like updater(newsHandler) + it should behave like updater(newsHandler, validTypes, validMethods) } } diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/PluginUpdateHandlerSpec.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/PluginUpdateHandlerSpec.scala index 279a0ce5f..6593d0872 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/PluginUpdateHandlerSpec.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/PluginUpdateHandlerSpec.scala @@ -3,7 +3,11 @@ package net.i2p.router.update import org.scalatest.FunSpec import org.scalatest.mock.MockitoSugar +import java.util.ArrayList + import net.i2p.router.RouterContext +import net.i2p.update.UpdateMethod +import net.i2p.update.UpdateType /** * @author str4d @@ -16,9 +20,21 @@ class PluginUpdateHandlerSpec extends FunSpec with CheckerBehaviors with Updater puh } + def validTypes = { + val vt = new ArrayList[UpdateType] + vt.add(UpdateType.ROUTER_UNSIGNED) + vt + } + + def validMethods = { + val vm = new ArrayList[UpdateMethod] + vm.add(UpdateMethod.HTTP) + vm + } + describe("A PluginUpdateHandler") { it should behave like checker(pluginUpdateHandler) - it should behave like updater(pluginUpdateHandler) + it should behave like updater(pluginUpdateHandler, validTypes, validMethods) } } diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UnsignedUpdateHandlerSpec.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UnsignedUpdateHandlerSpec.scala index 14a766d93..e7d4d7035 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UnsignedUpdateHandlerSpec.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UnsignedUpdateHandlerSpec.scala @@ -3,7 +3,7 @@ package net.i2p.router.update import org.scalatest.FunSpec import org.scalatest.mock.MockitoSugar -import java.util.TreeSet +import java.util.ArrayList import net.i2p.router.RouterContext import net.i2p.update.UpdateMethod @@ -21,13 +21,13 @@ class UnsignedUpdateHandlerSpec extends FunSpec with CheckerBehaviors with Updat } def validTypes = { - val vt = new TreeSet + val vt = new ArrayList[UpdateType] vt.add(UpdateType.ROUTER_UNSIGNED) vt } def validMethods = { - val vm = new TreeSet + val vm = new ArrayList[UpdateMethod] vm.add(UpdateMethod.HTTP) vm } diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdateHandlerSpec.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdateHandlerSpec.scala index 2b533813a..999f5a268 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdateHandlerSpec.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdateHandlerSpec.scala @@ -3,7 +3,11 @@ package net.i2p.router.update import org.scalatest.FunSpec import org.scalatest.mock.MockitoSugar +import java.util.ArrayList + import net.i2p.router.RouterContext +import net.i2p.update.UpdateMethod +import net.i2p.update.UpdateType /** * @author str4d @@ -16,7 +20,19 @@ class UpdateHandlerSpec extends FunSpec with UpdaterBehaviors with MockitoSugar uh } + def validTypes = { + val vt = new ArrayList[UpdateType] + vt.add(UpdateType.ROUTER_UNSIGNED) + vt + } + + def validMethods = { + val vm = new ArrayList[UpdateMethod] + vm.add(UpdateMethod.HTTP) + vm + } + describe("An UpdateHandler") { - it should behave like updater(updateHandler) + it should behave like updater(updateHandler, validTypes, validMethods) } } diff --git a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdaterBehaviors.scala b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdaterBehaviors.scala index b68299dcc..3bf44df9b 100644 --- a/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdaterBehaviors.scala +++ b/apps/routerconsole/java/test/scalatest/net/i2p/router/update/UpdaterBehaviors.scala @@ -2,8 +2,9 @@ package net.i2p.router.update import org.scalatest.FunSpec +import java.net.URI import java.util.Collections -import java.util.Set +import java.util.List import net.i2p.update.UpdateMethod import net.i2p.update.UpdateType @@ -13,13 +14,14 @@ import net.i2p.update.Updater * @author str4d */ trait UpdaterBehaviors { this: FunSpec => - def updater(newUpdater: => Updater, validTypes: => Set, - validMethods: => Set) { + def updater(newUpdater: => Updater, validTypes: => List[UpdateType], + validMethods: => List[UpdateMethod]) { it("should return null if no updateSources are provided") { - val updateSources = Collections.emptyList - val updateTask = newUpdater.update(validTypes[0], validMethods[0], + val updateSources = Collections.emptyList[URI] + val updateTask = newUpdater.update(validTypes.iterator().next(), + validMethods.iterator().next(), updateSources, "", "", 1000) - updateTask should be (null) + assert(updateTask == null) } } }