From ac7e019232903db38a03f644c3d31c858cbf3967 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 18 May 2022 15:07:29 +0000
Subject: [PATCH] 8286925: Move JSON parser used in JFR tests to test library

Reviewed-by: mgronlun, alanb
---
 test/jdk/jdk/jfr/tool/TestPrintJSON.java                      | 3 ++-
 .../jdk/jfr/tool => lib/jdk/test/lib/json}/JSONValue.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename test/{jdk/jdk/jfr/tool => lib/jdk/test/lib/json}/JSONValue.java (99%)

diff --git a/test/jdk/jdk/jfr/tool/TestPrintJSON.java b/test/jdk/jdk/jfr/tool/TestPrintJSON.java
index bfa22aae879..6a8977a672e 100644
--- a/test/jdk/jdk/jfr/tool/TestPrintJSON.java
+++ b/test/jdk/jdk/jfr/tool/TestPrintJSON.java
@@ -35,7 +35,8 @@ import jdk.jfr.ValueDescriptor;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedObject;
 import jdk.jfr.consumer.RecordingFile;
-import jdk.jfr.tool.JSONValue.JSONArray;
+import jdk.test.lib.json.JSONValue;
+import jdk.test.lib.json.JSONValue.JSONArray;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
diff --git a/test/jdk/jdk/jfr/tool/JSONValue.java b/test/lib/jdk/test/lib/json/JSONValue.java
similarity index 99%
rename from test/jdk/jdk/jfr/tool/JSONValue.java
rename to test/lib/jdk/test/lib/json/JSONValue.java
index 27c63116c88..d1092f06c3e 100644
--- a/test/jdk/jdk/jfr/tool/JSONValue.java
+++ b/test/lib/jdk/test/lib/json/JSONValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,7 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.jfr.tool;
+package jdk.test.lib.json;
 
 import java.util.ArrayList;
 import java.util.HashMap;