Move relevant tests as well

guardian · Aug 28, 2019 · b9eb139 · b9eb139
1 parent f3604d6
commit b9eb139
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/build.sbt b/build.sbt
@@ -99,6 +99,7 @@ lazy val `holiday-stops` = all(project in file("lib/holiday-stops"))
       scalaz,
       playJson,
       scalatest,
+      scalaCheck,
       playJsonExtensions,
       circe,
       circeParser,
@@ -255,7 +256,10 @@ lazy val `braze-to-salesforce-file-upload` = all(project in file("handlers/braze
 
 lazy val `holiday-stop-processor` = all(project in file("handlers/holiday-stop-processor"))
   .enablePlugins(RiffRaffArtifact)
-  .dependsOn(`holiday-stops`, effects)
+  .dependsOn(
+    `holiday-stops` % "compile->compile;test->test",
+    effects
+  )
 
 lazy val `metric-push-api` = all(project in file("handlers/metric-push-api"))
   .enablePlugins(RiffRaffArtifact)

diff --git a/handlers/holiday-stop-processor/build.sbt b/handlers/holiday-stop-processor/build.sbt
@@ -17,7 +17,5 @@ libraryDependencies ++= Seq(
   "com.amazonaws" % "aws-java-sdk-s3" % "1.11.566",
   "org.slf4j" % "slf4j-api" % "1.7.25",
   "ch.qos.logback" % "logback-classic" % "1.2.3",
-  "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
-  "org.scalatest" %% "scalatest" % "3.0.7" % Test,
-  "org.scalacheck" %% "scalacheck" % "1.14.0" % Test
+  "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2"
 )
diff --git a/...holiday-stop-processor/src/test/scala/com/gu/holidaystopprocessor/ErrorHandlingSpec.scala b/...holiday-stop-processor/src/test/scala/com/gu/holidaystopprocessor/ErrorHandlingSpec.scala
@@ -3,8 +3,8 @@ package com.gu.holidaystopprocessor
 import java.time.LocalDate
 
 import cats.implicits._
-import com.gu.holiday_stops.{HolidayCreditUpdate, OverallFailure, SalesforceHolidayWriteError, Subscription, ZuoraHolidayWriteError}
-import com.gu.holidaystopprocessor.Fixtures._
+import com.gu.holiday_stops.Fixtures._
+import com.gu.holiday_stops._
 import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequestsDetail.{HolidayStopRequestsDetail, ProductName, SubscriptionName}
 import org.scalatest._
 

diff --git a/...topprocessor/SubscriptionUpdateTest.scala → ...opprocessor/HolidayCreditUpdateTest.scala b/...topprocessor/SubscriptionUpdateTest.scala → ...opprocessor/HolidayCreditUpdateTest.scala
@@ -2,11 +2,11 @@ package com.gu.holidaystopprocessor
 
 import java.time.LocalDate
 
-import com.gu.holiday_stops.{Add, ChargeOverride, CurrentGuardianWeeklySubscription, ExtendedTerm, HolidayCredit, HolidayCreditUpdate, ZuoraHolidayWriteError}
-import com.gu.holidaystopprocessor.Fixtures.config
+import com.gu.holiday_stops.Fixtures.config
+import com.gu.holiday_stops._
 import org.scalatest.{EitherValues, FlatSpec, Matchers}
 
-class SubscriptionUpdateTest extends FlatSpec with Matchers with EitherValues {
+class HolidayCreditUpdateTest extends FlatSpec with Matchers with EitherValues {
 
   val guardianWeeklyProductRatePlanIds = Fixtures.config.guardianWeeklyProductRatePlanIds
 

diff --git a/...ay-stop-processor/src/test/scala/com/gu/holidaystopprocessor/HolidayStopProcessTest.scala b/...ay-stop-processor/src/test/scala/com/gu/holidaystopprocessor/HolidayStopProcessTest.scala
@@ -2,9 +2,9 @@ package com.gu.holidaystopprocessor
 
 import java.time.LocalDate
 
-import com.gu.holiday_stops.{HolidayCreditUpdate, HolidayStop, OverallFailure, SalesforceHolidayWriteError, Subscription, ZuoraHolidayWriteError}
-import com.gu.holidaystopprocessor.Fixtures.{config, mkSubscription}
-import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequestsDetail.{HolidayStopRequestsDetail, HolidayStopRequestsDetailChargeCode, HolidayStopRequestsDetailChargePrice, HolidayStopRequestsDetailId, ProductName, StoppedPublicationDate, SubscriptionName}
+import com.gu.holiday_stops.Fixtures.{config, mkSubscription}
+import com.gu.holiday_stops._
+import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequestsDetail._
 import org.scalatest.{EitherValues, FlatSpec, Matchers, OptionValues}
 
 class HolidayStopProcessTest extends FlatSpec with Matchers with EitherValues with OptionValues {

diff --git a/...om/gu/holidaystopprocessor/Fixtures.scala → ...scala/com/gu/holiday_stops/Fixtures.scala b/...om/gu/holidaystopprocessor/Fixtures.scala → ...scala/com/gu/holiday_stops/Fixtures.scala
@@ -1,10 +1,9 @@
-package com.gu.holidaystopprocessor
+package com.gu.holiday_stops
 
 import java.time.LocalDate
 
-import com.gu.holiday_stops.{Config, HolidayCreditProduct, HolidayStop, HolidayStopProcessor, Oauth, RatePlan, RatePlanCharge, Subscription, ZuoraConfig}
 import com.gu.salesforce.SalesforceAuthenticate.SFAuthConfig
-import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequest._
+import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequest.{HolidayStopRequest, HolidayStopRequestActionedCount, HolidayStopRequestEndDate, HolidayStopRequestStartDate}
 import com.gu.salesforce.holiday_stops.SalesforceHolidayStopRequestsDetail._
 
 object Fixtures {

diff --git a/...idaystopprocessor/HolidayCreditSpec.scala → .../gu/holiday_stops/HolidayCreditSpec.scala b/...idaystopprocessor/HolidayCreditSpec.scala → .../gu/holiday_stops/HolidayCreditSpec.scala
@@ -1,8 +1,7 @@
-package com.gu.holidaystopprocessor
+package com.gu.holiday_stops
 
 import java.time.LocalDate
 
-import com.gu.holiday_stops.{Config, CurrentGuardianWeeklySubscription, HolidayCredit, RatePlan, RatePlanCharge}
 import org.scalacheck.Prop.forAll
 import org.scalacheck._
 import org.scalatest.{EitherValues, OptionValues}

diff --git a/...idaystopprocessor/HolidayCreditTest.scala → .../gu/holiday_stops/HolidayCreditTest.scala b/...idaystopprocessor/HolidayCreditTest.scala → .../gu/holiday_stops/HolidayCreditTest.scala
@@ -1,6 +1,5 @@
-package com.gu.holidaystopprocessor
+package com.gu.holiday_stops
 
-import com.gu.holiday_stops.{CurrentGuardianWeeklySubscription, HolidayCredit, RatePlan}
 import org.scalatest.{EitherValues, FlatSpec, Matchers}
 
 class HolidayCreditTest extends FlatSpec with Matchers with EitherValues {

diff --git a/...lidaystopprocessor/SubscriptionTest.scala → ...m/gu/holiday_stops/SubscriptionTest.scala b/...lidaystopprocessor/SubscriptionTest.scala → ...m/gu/holiday_stops/SubscriptionTest.scala
@@ -1,8 +1,7 @@
-package com.gu.holidaystopprocessor
+package com.gu.holiday_stops
 
 import java.time.LocalDate
 
-import com.gu.holiday_stops.RatePlanCharge
 import org.scalatest.{FlatSpec, Matchers, OptionValues}
 
 class SubscriptionTest extends FlatSpec with Matchers with OptionValues {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,7 +15,8 @@ object Dependencies {
   val scalaz = "org.scalaz" %% "scalaz-core" % "7.2.18"
   val playJson = "com.typesafe.play" %% "play-json" % "2.6.9"
   val playJsonExtensions = "ai.x" %% "play-json-extensions" % "0.30.1"
-  val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" % "test"
+  val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" % Test
+  val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0" % Test
   val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.1"
   val awsS3 = "com.amazonaws" % "aws-java-sdk-s3" % awsVersion
   val awsSQS = "com.amazonaws" % "aws-java-sdk-sqs" % awsVersion