From 145fe74e70c9e52f3d82fa7d713739516c6af45d Mon Sep 17 00:00:00 2001 From: Nick F Date: Fri, 26 Oct 2018 09:46:00 -0700 Subject: [PATCH] add in some simple tests, they are not good tests --- src/main/scala/gs/nick/ApiHandler.scala | 8 ++++++++ src/test/scala/samples/junit.scala | 27 ++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/main/scala/gs/nick/ApiHandler.scala b/src/main/scala/gs/nick/ApiHandler.scala index a45e550..478c205 100644 --- a/src/main/scala/gs/nick/ApiHandler.scala +++ b/src/main/scala/gs/nick/ApiHandler.scala @@ -8,6 +8,10 @@ import scala.concurrent.Future object BirdsDao { var all: IndexedSeq[Bird] = IndexedSeq.empty + + def reset(): Unit = { + all = IndexedSeq.empty + } } @@ -39,6 +43,10 @@ class BirdsController extends BirdsHandler { object SightingsDao { var all: IndexedSeq[Sighting] = IndexedSeq.empty + + def reset(): Unit = { + all = IndexedSeq.empty + } } class SightingsController extends SightingsHandler { diff --git a/src/test/scala/samples/junit.scala b/src/test/scala/samples/junit.scala index 2c77343..e818d1c 100644 --- a/src/test/scala/samples/junit.scala +++ b/src/test/scala/samples/junit.scala @@ -2,9 +2,12 @@ package samples import scala.concurrent.duration.Duration - import org.junit._ import Assert._ +import gs.nick.server.birds.BirdsResource +import gs.nick.server.definitions.{Bird, Sighting} +import gs.nick.server.sightings.SightingsResource +import gs.nick.{BirdsController, BirdsDao, SightingsController, SightingsDao} import scala.concurrent.Await @@ -12,9 +15,27 @@ import scala.concurrent.Await class AppTest { + @Before + def setup(): Unit = { + BirdsDao.reset() + SightingsDao.reset() + } + + @Test + def testAddBirds(): Unit = { + val controller = new BirdsController + assertTrue(BirdsDao.all.isEmpty) + controller.addBird(BirdsResource.addBirdResponse)(Bird(1, "blue jay", "sings a lot")) + controller.addBird(BirdsResource.addBirdResponse)(Bird(2, "crow", "ugly")) + assertTrue(BirdsDao.all.length == 2) + } + @Test - def testAddGame() = { - assertTrue(true) + def testAddSighting(): Unit = { + val controller = new SightingsController + assertTrue(SightingsDao.all.isEmpty) + controller.addSighting(SightingsResource.addSightingResponse)(Sighting(1, 1, "2017-09-14", "saw a blue jay this morning")) + controller.addSighting(SightingsResource.addSightingResponse)(Sighting(2, 1, "2018-01-03", "At the park in Hayward")) } }