From 8519294118ed09f5bbd454629a2cde6078c77759 Mon Sep 17 00:00:00 2001
From: Scott Marlow <smarlow@redhat.com>
Date: Mon, 30 Sep 2024 15:43:23 -0400
Subject: [PATCH] add missing
 ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client2.setupEmployee +
 ee.jakarta.tck.persistence.core.entityManager.Client2.cleanupData

Signed-off-by: Scott Marlow <smarlow@redhat.com>
---
 .../core/criteriaapi/parameter/Client.java         | 14 ++++++++++++++
 .../persistence/core/entityManager/Client2.java    |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java
index 00e7ab7502..52fa89e732 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java
@@ -21,6 +21,8 @@
 
 
 
+import java.util.Properties;
+
 import ee.jakarta.tck.persistence.common.PMClientBase;
 
 public abstract class Client extends PMClientBase {
@@ -78,6 +80,18 @@ protected void createTestData() {
 		}
 	}
 
+	public void setupEmployee(String[] args, Properties p) throws Exception {
+	   logTrace("setupEmployee");
+	   try {
+		 super.setup(args, p);
+		 removeTestData();
+		 createTestData();
+	   } catch (Exception e) {
+		 logErr("Exception: ", e);
+		 throw new Exception("setupEmployee failed:", e);
+	   }
+	}
+
 	protected void removeTestData() {
 		logTrace( "removeTestData");
 		if (getEntityTransaction().isActive()) {
diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
index 868bd4057d..d3fc0d4507 100644
--- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
+++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java
@@ -95,6 +95,13 @@ public void cleanup() throws Exception {
 		}
 	}
 
+	public void cleanupData() throws Exception {
+		logTrace("Cleanup data");
+		removeTestData();
+		cleanup();
+	}
+
+
 	public List<List> getResultSetsFromStoredProcedure(StoredProcedureQuery spq) {
 		logTrace( "in getResultSetsFromStoredProcedure");
 		boolean results = true;