Fixes #57 - reformatting

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/TrainStation.scala

@@ -1,5 +1,7 @@
 package mesosphere.chaos.examples.trains
 
+import mesosphere.chaos.examples.trains.modules.{StationModule, ModernShuntingModule, TraditionalShuntingModule, LoadingModule}
+
 object TrainStation extends App {
  val traditionalModules = new TraditionalShuntingModule
  with LoadingModule
@@ -9,6 +11,8 @@ object TrainStation extends App {
  with LoadingModule
  with StationModule
 
+ println("### Traditional station:")
  println(traditionalModules.trainStation.prepareAndDispatchNextTrain())
+ println("\n### Modern station:")
  println(modernModules.trainStation.prepareAndDispatchNextTrain())
 }

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/LoadingModule.scala → chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/LoadingModule.scala

@@ -1,8 +1,8 @@
-package mesosphere.chaos.examples.trains
+package mesosphere.chaos.examples.trains.modules
 
 import com.softwaremill.macwire._
-import mesosphere.chaos.examples.trains.impl.loading.{CraneController, TrainLoader}
-import mesosphere.chaos.examples.trains.impl.shunting.PointSwitcher
+import mesosphere.chaos.examples.trains.modules.impl.loading.{CraneController, TrainLoader}
+import mesosphere.chaos.examples.trains.modules.impl.shunting.PointSwitcher
 
 @Module
 trait LoadingModule {

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/ShuntingModule.scala → chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/ShuntingModule.scala

@@ -1,12 +1,13 @@
-package mesosphere.chaos.examples.trains
+package mesosphere.chaos.examples.trains.modules
 
 import com.softwaremill.macwire._
-import mesosphere.chaos.examples.trains.impl.shunting._
+import mesosphere.chaos.examples.trains.modules.impl.shunting._
 
 @Module
 trait ShuntingModule {
  lazy val pointSwitcher = wire[PointSwitcher]
 
+ // dependency of the module
  def trainShunter: TrainShunter
 }
 

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/StationModule.scala → chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/StationModule.scala

@@ -1,7 +1,7 @@
-package mesosphere.chaos.examples.trains
+package mesosphere.chaos.examples.trains.modules
 
 import com.softwaremill.macwire._
-import mesosphere.chaos.examples.trains.impl.station.{TrainDispatch, TrainStation}
+import mesosphere.chaos.examples.trains.modules.impl.station.{TrainDispatch, TrainStation}
 
 @Module
 trait StationModule extends ShuntingModule with LoadingModule {

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/StatsModule.scala → chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/StatsModule.scala

@@ -1,7 +1,7 @@
-package mesosphere.chaos.examples.trains
+package mesosphere.chaos.examples.trains.modules
 
 import com.softwaremill.macwire._
-import mesosphere.chaos.examples.trains.impl.stats.{LoadingStats, ShuntingStats}
+import mesosphere.chaos.examples.trains.modules.impl.stats.{LoadingStats, ShuntingStats}
 
 class StatsModule(shuntingModule: ShuntingModule, loadingModule: LoadingModule) {
  lazy val loadingStats = wire[LoadingStats]

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/loading/CraneController.scala

@@ -0,0 +1,5 @@
+package mesosphere.chaos.examples.trains.modules.impl.loading
+
+class CraneController() {
+ def controll() = println("crane moved")
+}

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/loading/TrainLoader.scala

@@ -0,0 +1,11 @@
+package mesosphere.chaos.examples.trains.modules.impl.loading
+
+import mesosphere.chaos.examples.trains.modules.impl.shunting.PointSwitcher
+
+class TrainLoader(craneController: CraneController,
+ pointSwitcher: PointSwitcher) {
+ def load() = {
+ println("loaded")
+ pointSwitcher.switch()
+ }
+}

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/shunting/PointSwitcher.scala

@@ -0,0 +1,5 @@
+package mesosphere.chaos.examples.trains.modules.impl.shunting
+
+class PointSwitcher() {
+ def switch() = println("switched")
+}

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/shunting/TrainCarCoupler.scala

@@ -0,0 +1,3 @@
+package mesosphere.chaos.examples.trains.modules.impl.shunting
+
+class TrainCarCoupler() { def couple() = println("coupled") }

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/shunting/TrainShunter.scala

@@ -0,0 +1,18 @@
+package mesosphere.chaos.examples.trains.modules.impl.shunting
+
+trait TrainShunter { def shunt() = println("shunted") }
+class TraditionalTrainShunter(pointSwitcher: PointSwitcher,
+ trainCarCoupler: TrainCarCoupler) extends TrainShunter {
+ override def shunt() = {
+ println("# Traditional shunter:")
+ pointSwitcher.switch()
+ trainCarCoupler.couple()
+ super.shunt()
+ }
+}
+class TeleportingTrainShunter() extends TrainShunter {
+ override def shunt() = {
+ println("# Modern shunter:")
+ println("teleported")
+ }
+}

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/station/TrainDispatch.scala

@@ -0,0 +1,3 @@
+package mesosphere.chaos.examples.trains.modules.impl.station
+
+class TrainDispatch() { def dispatch() = "dispatched" }

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/station/TrainStation.scala

@@ -0,0 +1,18 @@
+package mesosphere.chaos.examples.trains.modules.impl.station
+
+import mesosphere.chaos.examples.trains.modules.impl.loading.TrainLoader
+import mesosphere.chaos.examples.trains.modules.impl.shunting.TrainShunter
+
+class TrainStation(trainShunter: TrainShunter,
+ trainLoader: TrainLoader,
+ trainDispatch: TrainDispatch) {
+
+ def prepareAndDispatchNextTrain() = {
+ println("## Shunter:")
+ trainShunter.shunt()
+ println("## Loader:")
+ trainLoader.load()
+ println("## Dispatcher:")
+ trainDispatch.dispatch()
+ }
+}

chaos-examples/src/main/scala/mesosphere/chaos/examples/trains/modules/impl/stats/StaatsModule.scala

@@ -0,0 +1,7 @@
+package mesosphere.chaos.examples.trains.modules.impl.stats
+
+import mesosphere.chaos.examples.trains.modules.impl.loading.TrainLoader
+import mesosphere.chaos.examples.trains.modules.impl.shunting.TrainShunter
+
+class LoadingStats(trainLoader: TrainLoader)
+class ShuntingStats(trainShunter: TrainShunter)

chaos-examples/src/test/scala/mesosphere/chaos/examples/trains/modules/ShuntingModuleTest.scala

@@ -0,0 +1,24 @@
+package mesosphere.chaos.examples.trains.modules
+
+import mesosphere.chaos.examples.trains.modules.impl.shunting.PointSwitcher
+import org.scalamock.scalatest.MockFactory
+import org.scalatest.FlatSpec
+
+class ShuntingModuleTest extends FlatSpec with MockFactory {
+ it should "work" in {
+ // given
+ val mockPointSwitcher = mock[PointSwitcher]
+
+ // when
+ val moduleToTest = new ShuntingModule2 {
+ // the mock implementation will be used to wire the graph
+ override lazy val pointSwitcher = mockPointSwitcher
+ }
+
+ moduleToTest.trainShunter.shunt()
+
+ // then
+
+ // verify(mockPointSwitcher).switch()
+ }
+}

project/build.scala

@@ -125,7 +125,7 @@ object Dependencies {
  // The macros subproject contains only code which is used at compile-time, hence the provided scope.
  macWireMacros % "provided",
  // The util subproject contains tagging, Wired and the @Module annotation; if you don't use these features, you don't need to include this dependency.
- // macWireUtil % "compile",
+ macWireUtil % "compile",
  macWireProxy % "compile",
 
  // test
@@ -142,7 +142,8 @@ object Dependencies {
  macWireProxy % "compile",
 
  // test
- Test.mockito % "test"
+ Test.mockito % "test",
+ Test.scalaMock % "test"
  )
 }
 
@@ -168,6 +169,7 @@ object Dependency {
  val JUnit = "4.12"
  val Mockito = "1.10.19"
  val Akka = "2.3.9"
+ val ScalaMock = "3.2.2"
  }
 
  val guava = "com.google.guava" % "guava" % V.Guava
@@ -208,6 +210,7 @@ object Dependency {
  object Test {
  val junit = "junit" % "junit" % V.JUnit
  val mockito = "org.mockito" % "mockito-all" % V.Mockito
+ val scalaMock = "org.scalamock" %% "scalamock-scalatest-support" % V.ScalaMock
  }
 }