Merge pull request #34 from snigdhasjg/master

Update junit version to 5

Author: kishorenc

build.gradle

@@ -2,8 +2,8 @@ plugins {
     id 'java'
     id 'signing'
     id 'maven-publish'
-    id('io.github.gradle-nexus.publish-plugin') version '1.1.0'
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id 'io.github.gradle-nexus.publish-plugin' version "${nexusPluginVersion}"
+    id 'com.github.johnrengelman.shadow' version "${shadowJarPluginVersion}"
 }
 
 repositories {
@@ -57,17 +57,23 @@ tasks.register('integrationTest', Test) {
 check.dependsOn integrationTest
 
 dependencies {
-    implementation "javax.xml.bind:jaxb-api:2.3.1"
-    implementation "com.fasterxml.jackson.core:jackson-databind:2.14.1"
-    implementation "io.swagger.core.v3:swagger-annotations:2.0.0"
-    implementation "org.slf4j:slf4j-api:2.0.5"
-    implementation "com.squareup.okhttp3:okhttp:4.9.1"
-
-    testImplementation "org.slf4j:slf4j-simple:2.0.5"
-    testImplementation "junit:junit:4.12"
-    testImplementation "org.hamcrest:hamcrest-all:1.3"
-    integrationTestImplementation "junit:junit:4.12"
-    integrationTestImplementation "org.hamcrest:hamcrest-all:1.3"
+    implementation "javax.xml.bind:jaxb-api:${javaxXmlBindVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonCoreVersion}"
+    implementation "io.swagger.core.v3:swagger-annotations:${swaggerCoreV3Version}"
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    implementation "com.squareup.okhttp3:okhttp:${okhttp3Version}"
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
+    testImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
+
+    integrationTestImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
+    integrationTestImplementation "org.hamcrest:hamcrest-all:${hamcrestVersion}"
+    integrationTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
+}
+
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
 }
 
 nexusPublishing {

docker-compose.yml

@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+  typesense:
+    image: typesense/typesense:0.24.1
+    container_name: "typesense"
+    ports:
+      - "8108:8108"
+    volumes:
+      - data-dir:/data
+    environment:
+      TYPESENSE_DATA_DIR: /data
+      TYPESENSE_API_KEY: xyz
+    restart: "no"
+
+volumes:
+  data-dir:

gradle.properties

@@ -0,0 +1,12 @@
+# Plugin versions
+nexusPluginVersion=1.1.0
+shadowJarPluginVersion=7.1.2
+
+# Dependency versions
+hamcrestVersion=1.3
+jacksonCoreVersion=2.14.1
+javaxXmlBindVersion=2.3.1
+junitJupiterVersion=5.9.3
+okhttp3Version=4.9.1
+slf4jVersion=2.0.5
+swaggerCoreV3Version=2.0.0

src/test/java/org/typesense/api/AliasesTest.java

@@ -1,53 +1,54 @@
 package org.typesense.api;
 
-import junit.framework.TestCase;
-import org.typesense.api.exceptions.TypesenseError;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.typesense.model.CollectionAlias;
 import org.typesense.model.CollectionAliasSchema;
 import org.typesense.model.CollectionAliasesResponse;
-import org.typesense.resources.Node;
 
-import java.time.Duration;
-import java.util.ArrayList;
-
-public class AliasesTest extends TestCase {
+class AliasesTest {
 
     private Client client;
     private Helper helper;
 
-    public void setUp() throws Exception {
-        super.setUp();
+    @BeforeEach
+    void setUp() throws Exception {
         helper = new Helper();
         helper.teardown();
         client = helper.getClient();
         helper.createTestAlias();
     }
 
-    public void tearDown() throws Exception {
-        super.tearDown();
+    @AfterEach
+    void tearDown() throws Exception {
         helper.teardown();
     }
 
-    public void testUpsert() throws Exception {
+    @Test
+    void testUpsert() throws Exception {
         CollectionAliasSchema collectionAliasSchema = new CollectionAliasSchema();
         collectionAliasSchema.collectionName("books_june11");
 
         System.out.println(client.aliases().upsert("books1", collectionAliasSchema));
     }
 
-    public void testRetrieveAll() throws Exception {
+    @Test
+    void testRetrieveAll() throws Exception {
         CollectionAliasesResponse collectionAliasesResponse = client.aliases().retrieve();
 
         System.out.println(collectionAliasesResponse);
     }
 
-    public void testRetrieveSingleAlias() throws Exception {
+    @Test
+    void testRetrieveSingleAlias() throws Exception {
         CollectionAlias collectionAlias = client.aliases("books").retrieve();
 
         System.out.println(collectionAlias);
     }
 
-    public void testDelete() throws Exception {
+    @Test
+    void testDelete() throws Exception {
         CollectionAlias collectionAlias = client.aliases("books").delete();
 
         System.out.println(collectionAlias);

src/test/java/org/typesense/api/CollectionsTest.java

@@ -1,49 +1,55 @@
 package org.typesense.api;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.typesense.model.CollectionResponse;
 import org.typesense.model.CollectionSchema;
 import org.typesense.model.Field;
 
 import java.util.ArrayList;
 
 
-public class CollectionsTest extends TestCase {
+class CollectionsTest {
 
-    public Client client;
+    Client client;
     private Helper helper;
 
-    public void setUp() throws Exception {
-        super.setUp();
+    @BeforeEach
+    void setUp() throws Exception {
         helper = new Helper();
         helper.teardown();
         this.client = helper.getClient();
     }
 
-    public void tearDown() throws Exception {
-        super.tearDown();
+    @AfterEach
+    void tearDown() throws Exception {
         helper.teardown();
     }
 
 
-    public void testRetrieveAllCollections() throws Exception {
+    @Test
+    void testRetrieveAllCollections() throws Exception {
         helper.createTestCollection();
         CollectionResponse[] collectionResponses = client.collections().retrieve();
         for(CollectionResponse c:collectionResponses)
             System.out.println(c);
     }
 
-    public void testRetrieveSingleCollection() throws Exception {
+    @Test
+    void testRetrieveSingleCollection() throws Exception {
         helper.createTestCollection();
         System.out.println(client.collections("books").retrieve());
     }
 
-    public void testDeleteCollection() throws Exception {
+    @Test
+    void testDeleteCollection() throws Exception {
         helper.createTestCollection();
         System.out.println(client.collections("books").delete());
     }
 
-    public void testCreateCollection() throws Exception {
+    @Test
+    void testCreateCollection() throws Exception {
 
         ArrayList<Field> fields = new ArrayList<>();
         fields.add(new Field().name("countryName").type(FieldTypes.STRING));