tests

andimarek · andimarek · commit 2418f5b89672 · 2024-02-19T11:32:48.000+10:00
diff --git a/agent-test/src/test/java/graphql/test/AgentTest.java b/agent-test/src/test/java/graphql/test/AgentTest.java
@@ -5,6 +5,8 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -13,7 +15,7 @@ public class AgentTest {
 
     @BeforeAll
     static void init() {
-        LoadAgent.load();
+        LoadAgent.loadIntoCurrentJVM();
     }
 
     @AfterAll
@@ -42,6 +44,15 @@ void testBatchLoader() {
         assertThat(executionTrackingResult.getDfResultTypes("/issues[1]/author"))
                 .isEqualTo(ExecutionTrackingResult.DFResultType.PENDING);
 
+        assertThat(executionTrackingResult.getDataLoaderNames()).isEqualTo(Collections.singletonList("userLoader"));
+
+        assertThat(executionTrackingResult.dataLoaderNameToBatchCall).hasSize(1);
+        List<ExecutionTrackingResult.BatchLoadingCall> userLoaderCalls = executionTrackingResult.dataLoaderNameToBatchCall.get("userLoader");
+        assertThat(userLoaderCalls).hasSize(1);
+        ExecutionTrackingResult.BatchLoadingCall batchLoadingCall = userLoaderCalls.get(0);
+
+        assertThat(batchLoadingCall.keyCount).isEqualTo(2);
+
         verifyAgentDataIsEmpty();
     }
 
diff --git a/agent-test/src/test/java/graphql/test/LoadAgent.java b/agent-test/src/test/java/graphql/test/LoadAgent.java
@@ -8,7 +8,7 @@
 public class LoadAgent {
 
 
-    public static void load() {
+    public static void loadIntoCurrentJVM() {
         ByteBuddyAgent.attach(new File("../agent/build/libs/agent.jar"), String.valueOf(ProcessHandle.current().pid()));
     }
 
diff --git a/src/main/java/graphql/agent/result/ExecutionTrackingResult.java b/src/main/java/graphql/agent/result/ExecutionTrackingResult.java
@@ -37,6 +37,7 @@ public class ExecutionTrackingResult {
     public final Map<ResultPath, String> finishedThreadPerPath = new ConcurrentHashMap<>();
     public final Map<ResultPath, String> startInvocationThreadPerPath = new ConcurrentHashMap<>();
     private final Map<ResultPath, DFResultType> dfResultTypes = new ConcurrentHashMap<>();
+    public final Map<String, List<BatchLoadingCall>> dataLoaderNameToBatchCall = new ConcurrentHashMap<>();
 
     public static class BatchLoadingCall {
         public BatchLoadingCall(int keyCount, String threadName) {
@@ -46,9 +47,9 @@ public BatchLoadingCall(int keyCount, String threadName) {
 
         public final int keyCount;
         public final String threadName;
+
     }
 
-    public final Map<String, List<BatchLoadingCall>> dataLoaderNameToBatchCall = new ConcurrentHashMap<>();
 
     public String print(String executionId) {
         StringBuilder s = new StringBuilder();
@@ -112,6 +113,10 @@ public enum DFResultType {
         PENDING,
     }
 
+    public List<String> getDataLoaderNames() {
+        return new ArrayList<>(dataLoaderToName.values());
+    }
+
 
     public void start(ResultPath path, long startTime) {
         timePerPath.put(path, startTime);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`public class LoadAgent {`
`9`	`9`
`10`	`10`
`11`		`- public static void load() {`
	`11`	`+ public static void loadIntoCurrentJVM() {`
`12`	`12`	`ByteBuddyAgent.attach(new File("../agent/build/libs/agent.jar"), String.valueOf(ProcessHandle.current().pid()));`
`13`	`13`	`}`
`14`	`14`