From 55787b4fb46aa5ade4cfa6adfbca56cd23d27ac0 Mon Sep 17 00:00:00 2001
From: Gary Huang <garyhuang@hotmail.ca>
Date: Tue, 8 Jan 2019 23:12:28 -0500
Subject: [PATCH] Move to dd-smoke-test project

---
 .../play-ittests.gradle => dd-smoke-tests/play/play.gradle   | 2 +-
 .../play}/src/main/conf/application.conf                     | 0
 .../play}/src/main/conf/logback.xml                          | 0
 .../play}/src/main/conf/routes                               | 0
 .../src/main/scala/app/controllers/HomeController.scala      | 0
 .../src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy | 2 +-
 settings.gradle                                              | 5 ++---
 7 files changed, 4 insertions(+), 5 deletions(-)
 rename dd-java-agent-ittests/play-ittests/play-ittests.gradle => dd-smoke-tests/play/play.gradle (98%)
 rename {dd-java-agent-ittests/play-ittests => dd-smoke-tests/play}/src/main/conf/application.conf (100%)
 rename {dd-java-agent-ittests/play-ittests => dd-smoke-tests/play}/src/main/conf/logback.xml (100%)
 rename {dd-java-agent-ittests/play-ittests => dd-smoke-tests/play}/src/main/conf/routes (100%)
 rename {dd-java-agent-ittests/play-ittests => dd-smoke-tests/play}/src/main/scala/app/controllers/HomeController.scala (100%)
 rename {dd-java-agent-ittests/play-ittests => dd-smoke-tests/play}/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy (95%)

diff --git a/dd-java-agent-ittests/play-ittests/play-ittests.gradle b/dd-smoke-tests/play/play.gradle
similarity index 98%
rename from dd-java-agent-ittests/play-ittests/play-ittests.gradle
rename to dd-smoke-tests/play/play.gradle
index 1b6c670841..8d5ee07134 100644
--- a/dd-java-agent-ittests/play-ittests/play-ittests.gradle
+++ b/dd-smoke-tests/play/play.gradle
@@ -114,7 +114,7 @@ task deletePIDFile() {
 
 tasks.withType(Test) {
   // so the test can get this property
-  jvmArgs "-Ddatadog.ittest.server.port=${playHttpPort}"
+  jvmArgs "-Ddatadog.smoketest.server.port=${playHttpPort}"
 
   testLogging {
     events "started"
diff --git a/dd-java-agent-ittests/play-ittests/src/main/conf/application.conf b/dd-smoke-tests/play/src/main/conf/application.conf
similarity index 100%
rename from dd-java-agent-ittests/play-ittests/src/main/conf/application.conf
rename to dd-smoke-tests/play/src/main/conf/application.conf
diff --git a/dd-java-agent-ittests/play-ittests/src/main/conf/logback.xml b/dd-smoke-tests/play/src/main/conf/logback.xml
similarity index 100%
rename from dd-java-agent-ittests/play-ittests/src/main/conf/logback.xml
rename to dd-smoke-tests/play/src/main/conf/logback.xml
diff --git a/dd-java-agent-ittests/play-ittests/src/main/conf/routes b/dd-smoke-tests/play/src/main/conf/routes
similarity index 100%
rename from dd-java-agent-ittests/play-ittests/src/main/conf/routes
rename to dd-smoke-tests/play/src/main/conf/routes
diff --git a/dd-java-agent-ittests/play-ittests/src/main/scala/app/controllers/HomeController.scala b/dd-smoke-tests/play/src/main/scala/app/controllers/HomeController.scala
similarity index 100%
rename from dd-java-agent-ittests/play-ittests/src/main/scala/app/controllers/HomeController.scala
rename to dd-smoke-tests/play/src/main/scala/app/controllers/HomeController.scala
diff --git a/dd-java-agent-ittests/play-ittests/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy b/dd-smoke-tests/play/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy
similarity index 95%
rename from dd-java-agent-ittests/play-ittests/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy
rename to dd-smoke-tests/play/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy
index 8c3d1bbff4..c8d7dd2f5e 100644
--- a/dd-java-agent-ittests/play-ittests/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy
+++ b/dd-smoke-tests/play/src/test/groovy/datadog/trace/agent/PlaySmokeTest.groovy
@@ -8,7 +8,7 @@ import spock.lang.Specification
 class PlaySmokeTest extends Specification {
 
   OkHttpClient client = OkHttpUtils.client()
-  private int port = Integer.parseInt(System.getProperty("datadog.ittest.server.port", "8080"))
+  private int port = Integer.parseInt(System.getProperty("datadog.smoketest.server.port", "8080"))
 
   def "welcome endpoint #n th time"() {
     setup:
diff --git a/settings.gradle b/settings.gradle
index 39955fe1a3..69c0cc93ed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,10 +17,9 @@ include ':dd-java-agent:agent-jmxfetch'
 // misc
 include ':dd-java-agent:testing'
 
+// smoke tests
 include ':dd-smoke-tests:wildfly'
-
-include ':dd-java-agent-ittests'
-include ':dd-java-agent-ittests:play-ittests'
+include ':dd-smoke-tests:play'
 
 // instrumentation:
 include ':dd-java-agent:instrumentation:akka-http-10.0'