From c2420189618669753f50d98f0486065c407f8cfe Mon Sep 17 00:00:00 2001
From: Mauricio Binda da Costa <mauriciobinda@hotmail.com>
Date: Mon, 6 May 2024 01:45:24 -0300
Subject: [PATCH] test

---
 .../com/whatsapp/api/MockServerTestUtils.java | 20 ++++++++++++
 .../com/whatsapp/api/MockServerUtilsTest.java | 32 -------------------
 .../impl/WhatsappBusinessCloudApiTest.java    |  6 ++--
 .../WhatsappBusinessManagementApiTest.java    |  6 ++--
 4 files changed, 24 insertions(+), 40 deletions(-)
 create mode 100644 src/test/java/com/whatsapp/api/MockServerTestUtils.java
 delete mode 100644 src/test/java/com/whatsapp/api/MockServerUtilsTest.java

diff --git a/src/test/java/com/whatsapp/api/MockServerTestUtils.java b/src/test/java/com/whatsapp/api/MockServerTestUtils.java
new file mode 100644
index 000000000..55c90f178
--- /dev/null
+++ b/src/test/java/com/whatsapp/api/MockServerTestUtils.java
@@ -0,0 +1,20 @@
+package com.whatsapp.api;
+
+import com.whatsapp.api.impl.WhatsappBusinessCloudApi;
+import com.whatsapp.api.impl.WhatsappBusinessManagementApi;
+import mockwebserver3.MockWebServer;
+import org.junit.jupiter.api.BeforeAll;
+
+
+public class MockServerTestUtils extends TestUtils {
+
+    public MockWebServer mockWebServer;
+
+    public String baseUrl;
+
+    public WhatsappBusinessCloudApi whatsappBusinessCloudApi;
+
+    public WhatsappBusinessManagementApi whatsappBusinessManagementApi;
+
+
+}
diff --git a/src/test/java/com/whatsapp/api/MockServerUtilsTest.java b/src/test/java/com/whatsapp/api/MockServerUtilsTest.java
deleted file mode 100644
index 5833627d0..000000000
--- a/src/test/java/com/whatsapp/api/MockServerUtilsTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.whatsapp.api;
-
-import com.whatsapp.api.configuration.WhatsappApiConfig;
-import com.whatsapp.api.impl.WhatsappBusinessCloudApi;
-import com.whatsapp.api.impl.WhatsappBusinessManagementApi;
-import mockwebserver3.MockWebServer;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.io.IOException;
-
-
-public class MockServerUtilsTest extends TestUtils {
-
-    public static MockWebServer mockWebServer;
-
-    public static String baseUrl;
-
-    public static WhatsappBusinessCloudApi whatsappBusinessCloudApi;
-
-    public static WhatsappBusinessManagementApi whatsappBusinessManagementApi;
-
-
-
-
-
-
-
-}
diff --git a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
index 479885cda..704c4a783 100644
--- a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
+++ b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
@@ -1,6 +1,6 @@
 package com.whatsapp.api.impl;
 
-import com.whatsapp.api.MockServerUtilsTest;
+import com.whatsapp.api.MockServerTestUtils;
 import com.whatsapp.api.WhatsappApiFactory;
 import com.whatsapp.api.configuration.ApiVersion;
 import com.whatsapp.api.configuration.WhatsappApiConfig;
@@ -20,8 +20,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
@@ -30,7 +28,7 @@
 
 import static com.whatsapp.api.configuration.WhatsappApiConfig.getApiVersion;
 
-public class WhatsappBusinessCloudApiTest extends MockServerUtilsTest {
+public class WhatsappBusinessCloudApiTest extends MockServerTestUtils {
 
     private final String PHONE_NUMBER_1 = "121212121212";
     private final String PHONE_NUMBER_ID = "888888888888";
diff --git a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
index 394d797fb..efb2e5852 100644
--- a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
+++ b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
@@ -1,7 +1,7 @@
 package com.whatsapp.api.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.whatsapp.api.MockServerUtilsTest;
+import com.whatsapp.api.MockServerTestUtils;
 import com.whatsapp.api.TestConstants;
 import com.whatsapp.api.WhatsappApiFactory;
 import com.whatsapp.api.configuration.WhatsappApiConfig;
@@ -23,8 +23,6 @@
 import mockwebserver3.RecordedRequest;
 import org.json.JSONException;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
@@ -34,7 +32,7 @@
 
 import static com.whatsapp.api.configuration.WhatsappApiConfig.getApiVersion;
 
-public class WhatsappBusinessManagementApiTest extends MockServerUtilsTest {
+public class WhatsappBusinessManagementApiTest extends MockServerTestUtils {
 
     private final String  API_VERSION = getApiVersion().getValue();