Enhancements and Modernization of Test Classes

api/src/main/java/com/theokanning/openai/moderation/ModerationCategories.java

@@ -3,8 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * An object containing the flags for each moderation category
  *

api/src/main/java/com/theokanning/openai/threads/ThreadRequest.java

@@ -1,6 +1,5 @@
 package com.theokanning.openai.threads;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.theokanning.openai.messages.MessageRequest;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

api/src/test/java/com/theokanning/openai/JsonTest.java

@@ -30,7 +30,7 @@
 import java.nio.file.Paths;
 import static org.junit.jupiter.api.Assertions.*;
 
-public class JsonTest {
+class JsonTest {
 
     @ParameterizedTest
     @ValueSource(classes = {

client/src/main/java/com/theokanning/openai/client/OpenAiApi.java

@@ -1,7 +1,6 @@
 package com.theokanning.openai.client;
 
 import com.theokanning.openai.DeleteResult;
-import com.theokanning.openai.ListSearchParameters;
 import com.theokanning.openai.OpenAiResponse;
 import com.theokanning.openai.assistants.*;
 import com.theokanning.openai.audio.CreateSpeechRequest;

service/src/test/java/com/theokanning/openai/service/AssistantFunctionTest.java

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.theokanning.openai.ListSearchParameters;
 import com.theokanning.openai.OpenAiResponse;
 import com.theokanning.openai.assistants.Assistant;
 import com.theokanning.openai.assistants.AssistantFunction;
@@ -21,9 +20,7 @@
 import com.theokanning.openai.runs.RequiredAction;
 import com.theokanning.openai.runs.Run;
 import com.theokanning.openai.runs.RunCreateRequest;
-import com.theokanning.openai.runs.RunStep;
 import com.theokanning.openai.runs.SubmitToolOutputRequestItem;
-import com.theokanning.openai.runs.SubmitToolOutputs;
 import com.theokanning.openai.runs.SubmitToolOutputsRequest;
 import com.theokanning.openai.runs.ToolCall;
 import com.theokanning.openai.threads.Thread;
@@ -35,9 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class AssistantFunctionTest {

service/src/test/java/com/theokanning/openai/service/AssistantTest.java

@@ -15,7 +15,7 @@
 
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class AssistantTest {
+class AssistantTest {
 
     static OpenAiService service = new OpenAiService(System.getenv("OPENAI_TOKEN"));
     static String assistantId;
@@ -44,16 +44,16 @@ void createAssistant() {
 
         assistantId = assistant.getId();
 
-        assertEquals(assistant.getName(), "Math Tutor");
-        assertEquals(assistant.getTools().get(0).getType(), AssistantToolsEnum.CODE_INTERPRETER);
+        assertEquals("Math Tutor", assistant.getName());
+        assertEquals(AssistantToolsEnum.CODE_INTERPRETER, assistant.getTools().get(0).getType());
     }
 
     @Test
     @Order(2)
     void retrieveAssistant() {
         Assistant assistant = service.retrieveAssistant(assistantId);
 
-        assertEquals(assistant.getName(), "Math Tutor");
+        assertEquals("Math Tutor", assistant.getName());
     }
 
     @Test
@@ -105,7 +105,7 @@ void listAssistantFiles() {
 
         assertFalse(files.isEmpty());
         assertEquals(files.get(0).getId(), fileId);
-        assertEquals(files.get(0).getObject(), "assistant.file");
+        assertEquals("assistant.file", files.get(0).getObject());
     }
 
     @Test

service/src/test/java/com/theokanning/openai/service/AudioTest.java

@@ -16,7 +16,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 
-public class AudioTest {
+class AudioTest {
 
     static String englishAudioFilePath = "src/test/resources/hello-world.mp3";
 

service/src/test/java/com/theokanning/openai/service/CompletionTest.java

@@ -13,7 +13,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 
-public class CompletionTest {
+class CompletionTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     OpenAiService service = new OpenAiService(token);

service/src/test/java/com/theokanning/openai/service/EditTest.java

@@ -7,7 +7,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class EditTest {
+class EditTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     com.theokanning.openai.service.OpenAiService service = new OpenAiService(token);

service/src/test/java/com/theokanning/openai/service/EmbeddingTest.java

@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 
-public class EmbeddingTest {
+class EmbeddingTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     com.theokanning.openai.service.OpenAiService service = new OpenAiService(token);

service/src/test/java/com/theokanning/openai/service/FileTest.java

@@ -18,7 +18,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class FileTest {
+class FileTest {
     static String filePath = "src/test/resources/fine-tuning-data.jsonl";
 
     String token = System.getenv("OPENAI_TOKEN");

service/src/test/java/com/theokanning/openai/service/FineTuningTest.java

@@ -12,7 +12,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class FineTuningTest {
+class FineTuningTest {
     static OpenAiService service;
     static String fileId;
     static String fineTuningJobId;

service/src/test/java/com/theokanning/openai/service/ImageTest.java

@@ -13,7 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
-public class ImageTest {
+class ImageTest {
 
     static String filePath = "src/test/resources/penguin.png";
     static String fileWithAlphaPath = "src/test/resources/penguin_with_alpha.png";

service/src/test/java/com/theokanning/openai/service/MessageTest.java

@@ -6,7 +6,6 @@
 import com.theokanning.openai.messages.MessageFile;
 import com.theokanning.openai.messages.MessageRequest;
 import com.theokanning.openai.messages.ModifyMessageRequest;
-import com.theokanning.openai.threads.Thread;
 import com.theokanning.openai.threads.ThreadRequest;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -21,7 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
-public class MessageTest {
+class MessageTest {
 
     static OpenAiService service;
 

service/src/test/java/com/theokanning/openai/service/ModelTest.java

@@ -9,7 +9,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 
-public class ModelTest {
+class ModelTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     com.theokanning.openai.service.OpenAiService service = new OpenAiService(token);

service/src/test/java/com/theokanning/openai/service/ModerationTest.java

@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
-public class ModerationTest {
+class ModerationTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     com.theokanning.openai.service.OpenAiService service = new OpenAiService(token);

service/src/test/java/com/theokanning/openai/service/OpenAiServiceTest.java

@@ -11,7 +11,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class OpenAiServiceTest {
+class OpenAiServiceTest {
 
     @Test
     void assertTokenNotNull() {

service/src/test/java/com/theokanning/openai/service/ResponseBodyCallbackTest.java

@@ -13,7 +13,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ResponseBodyCallbackTest {
+class ResponseBodyCallbackTest {
 
     @Test
     void testHappyPath() {

service/src/test/java/com/theokanning/openai/service/ThreadTest.java

@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class ThreadTest {
+class ThreadTest {
 
     String token = System.getenv("OPENAI_TOKEN");
     OpenAiService service = new OpenAiService(token);