Switched to JUnit

ankane · ankane · commit cece4db8caac · 2023-10-26T03:05:17.000-07:00
diff --git a/build.sbt b/build.sbt
@@ -11,7 +11,7 @@ lazy val root = (project in file("."))
     libraryDependencies ++= Seq(
       "org.postgresql" % "postgresql" % "42.5.4",
       "org.scala-lang" % "scala-library" % scalaVersion.value % Test,
-      "org.scalameta" %% "munit" % "0.7.29" % Test,
+      "com.github.sbt" % "junit-interface" % "0.13.2" % Test,
       "com.typesafe.slick" %% "slick" % "3.4.1" % Test,
       "org.slf4j" % "slf4j-nop" % "1.7.26" % Test,
       "org.springframework" % "spring-jdbc" % "5.3.27" % Test,
diff --git a/src/test/java/com/pgvector/Hibernate.java b/src/test/java/com/pgvector/Hibernate.java
@@ -8,9 +8,11 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.junit.Test;
 
 public class Hibernate {
-    public static void example() throws SQLException {
+    @Test
+    public void example() throws SQLException {
         // disable logging
         System.setProperty("org.jboss.logging.provider", "slf4j");
 
diff --git a/src/test/java/com/pgvector/JDBCJava.java b/src/test/java/com/pgvector/JDBCJava.java
@@ -3,9 +3,20 @@
 import java.sql.*;
 import com.pgvector.PGvector;
 import org.postgresql.PGConnection;
+import org.junit.Test;
 
 public class JDBCJava {
-    public static void example(boolean read_binary) throws SQLException {
+    @Test
+    public void works() throws SQLException {
+        example(false);
+    }
+
+    @Test
+    public void readBinary() throws SQLException {
+        example(true);
+    }
+
+    private void example(boolean read_binary) throws SQLException {
         Connection conn = DriverManager.getConnection("jdbc:postgresql://localhost:5432/pgvector_java_test");
         if (read_binary) {
             conn.unwrap(PGConnection.class).setPrepareThreshold(-1);
diff --git a/src/test/java/com/pgvector/SpringJDBC.java b/src/test/java/com/pgvector/SpringJDBC.java
@@ -6,9 +6,11 @@
 import com.pgvector.PGvector;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.junit.Test;
 
 public class SpringJDBC {
-    public static void example() throws SQLException {
+    @Test
+    public void example() throws SQLException {
         DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setUrl("jdbc:postgresql://localhost:5432/pgvector_java_test");
 
diff --git a/src/test/scala/com/pgvector/JDBCScala.scala b/src/test/scala/com/pgvector/JDBCScala.scala
@@ -2,28 +2,30 @@ package com.pgvector
 
 import java.sql.DriverManager
 import com.pgvector.PGvector
+import org.junit.Test
 
-object JDBCScala {
+class JDBCScala {
+  @Test
   def example(): Unit = {
     val conn = DriverManager.getConnection("jdbc:postgresql://localhost:5432/pgvector_java_test")
 
     val setupStmt = conn.createStatement()
     setupStmt.executeUpdate("CREATE EXTENSION IF NOT EXISTS vector")
-    setupStmt.executeUpdate("DROP TABLE IF EXISTS jdbc_items")
+    setupStmt.executeUpdate("DROP TABLE IF EXISTS jdbc_scala_items")
 
     PGvector.addVectorType(conn)
 
     val createStmt = conn.createStatement()
-    createStmt.executeUpdate("CREATE TABLE jdbc_items (id bigserial PRIMARY KEY, embedding vector(3))")
+    createStmt.executeUpdate("CREATE TABLE jdbc_scala_items (id bigserial PRIMARY KEY, embedding vector(3))")
 
-    val insertStmt = conn.prepareStatement("INSERT INTO jdbc_items (embedding) VALUES (?), (?), (?), (?)")
+    val insertStmt = conn.prepareStatement("INSERT INTO jdbc_scala_items (embedding) VALUES (?), (?), (?), (?)")
     insertStmt.setObject(1, new PGvector(Array[Float](1, 1, 1)))
     insertStmt.setObject(2, new PGvector(Array[Float](2, 2, 2)))
     insertStmt.setObject(3, new PGvector(Array[Float](1, 1, 2)))
     insertStmt.setObject(4, new PGvector())
     insertStmt.executeUpdate()
 
-    val neighborStmt = conn.prepareStatement("SELECT * FROM jdbc_items ORDER BY embedding <-> ? LIMIT 5")
+    val neighborStmt = conn.prepareStatement("SELECT * FROM jdbc_scala_items ORDER BY embedding <-> ? LIMIT 5")
     neighborStmt.setObject(1, new PGvector(Array[Float](1, 1, 1)))
     val rs = neighborStmt.executeQuery()
     while (rs.next()) {
@@ -32,7 +34,7 @@ object JDBCScala {
     }
 
     val indexStmt = conn.createStatement()
-    indexStmt.executeUpdate("CREATE INDEX jdbc_index ON jdbc_items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100)")
+    indexStmt.executeUpdate("CREATE INDEX jdbc_scala_index ON jdbc_scala_items USING ivfflat (embedding vector_l2_ops) WITH (lists = 100)")
 
     conn.close()
   }
diff --git a/src/test/scala/com/pgvector/MainSpec.scala b/src/test/scala/com/pgvector/MainSpec.scala
diff --git a/src/test/scala/com/pgvector/Slick.scala b/src/test/scala/com/pgvector/Slick.scala
@@ -5,13 +5,15 @@ import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext.Implicits.global
 import slick.jdbc.PostgresProfile.api._
 import com.pgvector.PGvector
+import org.junit.Test
 
 class Items(tag: Tag) extends Table[(String)](tag, "slick_items") {
   def embedding = column[String]("embedding", O.SqlType("vector(3)"))
   def * = (embedding)
 }
 
-object Slick {
+class Slick {
+  @Test
   def example(): Unit = {
     val db = Database.forURL("jdbc:postgresql://localhost:5432/pgvector_java_test", driver="org.postgresql.Driver")
 
