From 269f2de33396fc7d9b381f87c15e32f1d507a847 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Fri, 29 Nov 2019 22:15:51 +1300
Subject: [PATCH] #1872 - Reporting ORM metrics defaults to suppressing sql and
 location after initial collection

---
 .../query/finder/TestCustomerFinder.java      | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
index 66ac18633..276c780b6 100644
--- a/src/test/java/org/tests/query/finder/TestCustomerFinder.java
+++ b/src/test/java/org/tests/query/finder/TestCustomerFinder.java
@@ -22,6 +22,41 @@ import static org.junit.Assert.assertTrue;
 
 public class TestCustomerFinder extends BaseTestCase {
 
+  @Test
+  public void a_runFirst_metricsAsJson_sqlInInitialCollectionOnly() {
+
+    ResetBasicData.reset();
+
+    runQueries();
+
+    StringBuilder buffer0 = new StringBuilder();
+    server().getMetaInfoManager()
+      .collectMetricsAsJson()
+      .withHeader(false)
+      .write(buffer0);
+
+    String json0 = buffer0.toString();
+    System.out.println(json0);
+    assertThat(json0).contains("\"name\":\"txn.main\"");
+    assertThat(json0).contains("\"name\":\"Customer.findList\"");
+    //assertThat(json0).contains("\"sql\":\"select t0.id, t0.status, t0.name");
+
+    runQueries();
+
+    StringBuilder buffer1 = new StringBuilder();
+    server().getMetaInfoManager()
+      .collectMetricsAsJson()
+      .withHeader(false)
+      .write(buffer1);
+
+    String json1 = buffer1.toString();
+    System.out.println(json1);
+    assertThat(json1).contains("\"name\":\"txn.main\"");
+    assertThat(json1).contains("\"name\":\"Customer.findList\"");
+    assertThat(json1).doesNotContain("\"sql\":\"select t0.id, t0.status, t0.name");
+
+  }
+
   @Test
   public void test_ref() {
 
@@ -245,41 +280,6 @@ public class TestCustomerFinder extends BaseTestCase {
     assertThat(metricsJson).contains("\"name\":\"Customer.findList\"");
   }
 
-  @Test
-  public void test_metricsAsJson_sqlInInitialCollectionOnly() {
-
-    ResetBasicData.reset();
-
-    runQueries();
-
-    StringBuilder buffer0 = new StringBuilder();
-    server().getMetaInfoManager()
-      .collectMetricsAsJson()
-      .withHeader(false)
-      .write(buffer0);
-
-    String json0 = buffer0.toString();
-    System.out.println(json0);
-    assertThat(json0).contains("\"name\":\"txn.main\"");
-    assertThat(json0).contains("\"name\":\"Customer.findList\"");
-    assertThat(json0).contains("\"sql\":\"select t0.id, t0.status, t0.name");
-
-    runQueries();
-
-    StringBuilder buffer1 = new StringBuilder();
-    server().getMetaInfoManager()
-      .collectMetricsAsJson()
-      .withHeader(false)
-      .write(buffer1);
-
-    String json1 = buffer1.toString();
-    System.out.println(json1);
-    assertThat(json1).contains("\"name\":\"txn.main\"");
-    assertThat(json1).contains("\"name\":\"Customer.findList\"");
-    assertThat(json1).doesNotContain("\"sql\":\"select t0.id, t0.status, t0.name");
-
-  }
-
   private void runQueries() {
     resetAllMetrics();