refactor(test): retrofitStubs available to other modules (#252)

spinnaker · Apr 6, 2018 · 4a9f9c0 · 4a9f9c0
1 parent 393f1a6
commit 4a9f9c0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/echo-pipelinetriggers/echo-pipelinetriggers.gradle b/echo-pipelinetriggers/echo-pipelinetriggers.gradle
@@ -33,5 +33,5 @@ dependencies {
   compile group: 'org.codehaus.groovy', name: 'groovy', version: "2.4.5"
   compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
   testCompile "org.spockframework:spock-core:1.0-groovy-2.4"
-
+  testCompile project(':echo-test')
 }
diff --git a/.../groovy/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitorSpec.groovy b/.../groovy/com/netflix/spinnaker/echo/pipelinetriggers/monitor/PubsubEventMonitorSpec.groovy
@@ -26,7 +26,6 @@ import com.netflix.spinnaker.echo.model.pubsub.MessageDescription
 import com.netflix.spinnaker.echo.model.pubsub.PubsubSystem
 import com.netflix.spinnaker.echo.model.trigger.PubsubEvent
 import com.netflix.spinnaker.echo.pipelinetriggers.PipelineCache
-import com.netflix.spinnaker.echo.pipelinetriggers.monitor.PubsubEventMonitor
 import com.netflix.spinnaker.echo.test.RetrofitStubs
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact

diff --git a/echo-test/echo-test.gradle b/echo-test/echo-test.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2018 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dependencies {
+  spinnaker.group("retrofitDefault")
+  compile project(':echo-pipelinetriggers')
+  spinnaker.group("spockBase")
+}
diff --git a/.../spinnaker/echo/test/RetrofitStubs.groovy → .../spinnaker/echo/test/RetrofitStubs.groovy b/.../spinnaker/echo/test/RetrofitStubs.groovy → .../spinnaker/echo/test/RetrofitStubs.groovy
@@ -7,7 +7,6 @@ import com.netflix.spinnaker.echo.model.pubsub.MessageDescription
 import com.netflix.spinnaker.echo.model.pubsub.PubsubSystem
 import com.netflix.spinnaker.echo.model.trigger.*
 import com.netflix.spinnaker.echo.pipelinetriggers.monitor.PubsubEventMonitor
-import com.netflix.spinnaker.echo.pipelinetriggers.monitor.WebhookEventMonitor
 import com.netflix.spinnaker.kork.artifacts.model.Artifact
 import com.netflix.spinnaker.kork.artifacts.model.ExpectedArtifact
 import retrofit.RetrofitError
@@ -39,9 +38,9 @@ trait RetrofitStubs {
   final Trigger enabledWebhookTrigger = Trigger.builder().enabled(true).type('webhook').build()
   final Trigger disabledWebhookTrigger = Trigger.builder().enabled(false).type('webhook').build()
   final Trigger nonWebhookTrigger = Trigger.builder().enabled(true).type('not webhook').build()
-  final Trigger webhookTriggerWithConstraints = Trigger.builder().enabled(true).type('webhook').payloadConstraints([ "application": "myApplicationName", "pipeline": "myPipeLineName" ]).build()
+  final Trigger webhookTriggerWithConstraints = Trigger.builder().enabled(true).type('webhook').payloadConstraints(["application": "myApplicationName", "pipeline": "myPipeLineName" ]).build()
   final Trigger webhookTriggerWithoutConstraints = Trigger.builder().enabled(true).type('webhook').payloadConstraints().build()
-  final Trigger teamcityTriggerWithConstraints = Trigger.builder().enabled(true).type('teamcity').payloadConstraints([ "application": "myApplicationName", "pipeline": "myPipeLineName" ]).build()
+  final Trigger teamcityTriggerWithConstraints = Trigger.builder().enabled(true).type('teamcity').payloadConstraints(["application": "myApplicationName", "pipeline": "myPipeLineName" ]).build()
   final Trigger teamcityTriggerWithoutConstraints = Trigger.builder().enabled(true).type('teamcity').payloadConstraints().build()
 
   final Trigger enabledGooglePubsubTrigger = Trigger.builder()

diff --git a/settings.gradle b/settings.gradle
@@ -14,7 +14,18 @@
  * limitations under the License.
  */
 
-include 'echo-core', 'echo-model', 'echo-web', 'echo-notifications', 'echo-pipelinetriggers', 'echo-scheduler', 'echo-rest', 'echo-webhooks', 'echo-pubsub-core', 'echo-pubsub-aws', 'echo-pubsub-google'
+include 'echo-core',
+        'echo-model',
+        'echo-web',
+        'echo-notifications',
+        'echo-pipelinetriggers',
+        'echo-scheduler',
+        'echo-rest',
+        'echo-webhooks',
+        'echo-pubsub-core',
+        'echo-pubsub-aws',
+        'echo-pubsub-google',
+        'echo-test'
 
 rootProject.name = 'echo'