From 85240a95ae25b795cf67125faa32dd4c7032afe3 Mon Sep 17 00:00:00 2001
From: dougqh <dougqh@gmail.com>
Date: Tue, 1 Oct 2019 16:16:52 -0400
Subject: [PATCH] Revert "Changing test set-up timing"

This reverts commit 0dc63d7d3cf1412a08420cb7a201ca55be8d7fe6.
---
 ...Elasticsearch53SpringRepositoryTest.groovy | 33 +++----------------
 .../transport-5.3/transport-5.3.gradle        |  1 -
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
index b66a9ecb2a..437a7e909d 100644
--- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
+++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
@@ -12,43 +12,22 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 
 @RetryOnFailure(times = 3, delaySeconds = 1)
 class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
-  static def repo
+  @Shared
+  ApplicationContext applicationContext = new AnnotationConfigApplicationContext(Config)
 
-  def createRepo() {
-    def applicationContext
-    def repo
+  @Shared
+  DocRepository repo = applicationContext.getBean(DocRepository)
 
-    runUnderTrace("createRepo") {
-      applicationContext = new AnnotationConfigApplicationContext(Config)
-      repo = applicationContext.getBean(DocRepository)
-    }
-    // NodeStatsAction
-    // IndicesExistAction
-    // IndexAction
-    // RefreshAction
-    TEST_WRITER.waitForTraces(1)
+  def setup() {
     TEST_WRITER.clear()
-
-    return repo
-  }
-
-  def setupRepo() {
-    if (repo == null) {
-      repo = createRepo()
-    }
-
     runUnderTrace("delete") {
       repo.deleteAll()
     }
     TEST_WRITER.waitForTraces(1)
     TEST_WRITER.clear()
-
-    return repo
   }
 
   def "test empty repo"() {
-    def repo = setupRepo()
-
     when:
     def result = repo.findAll()
 
@@ -83,8 +62,6 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
   }
 
   def "test CRUD"() {
-    def repo = setupRepo()
-
     when:
     def doc = new Doc()
 
diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
index ec47d057f2..7dc6870d9b 100644
--- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/transport-5.3.gradle
@@ -35,7 +35,6 @@ dependencies {
 
   testCompile project(':dd-java-agent:instrumentation:apache-httpasyncclient-4')
   testCompile project(':dd-java-agent:instrumentation:netty-4.1')
-  // testCompile project(':dd-java-agent:instrumentation:spring-data-1.9')
 
   testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
   testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'