diff --git a/prql-java/pom.xml b/prql-java/pom.xml index 3073f2c26aed..20011952b624 100644 --- a/prql-java/pom.xml +++ b/prql-java/pom.xml @@ -82,7 +82,7 @@ 3.40.1.0 1.17.6 - 7.5 + 7.5 3.10.1 3.0.0 @@ -140,9 +140,9 @@ ${testcontainers.version} - org.testng - testng - ${testng.version} + org.testing + testing + ${testing.version} org.xerial diff --git a/prql-java/prql-api/pom.xml b/prql-java/prql-api/pom.xml index 53ef11940af1..21b7de260d4c 100644 --- a/prql-java/prql-api/pom.xml +++ b/prql-java/prql-api/pom.xml @@ -18,8 +18,8 @@ - org.testng - testng + org.testing + testing test diff --git a/prql-java/prql-api/src/test/java/org/prqllang/ApiImplTest.java b/prql-java/prql-api/src/test/java/org/prqllang/ApiImplTest.java index ddc83d28ab3f..03db4b157881 100644 --- a/prql-java/prql-api/src/test/java/org/prqllang/ApiImplTest.java +++ b/prql-java/prql-api/src/test/java/org/prqllang/ApiImplTest.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import org.testing.Assert; +import org.testing.annotations.DataProvider; +import org.testing.annotations.Test; public abstract class ApiImplTest { protected abstract PrqlApi newInstance(); diff --git a/prql-java/prql-api/src/test/java/org/prqllang/internal/CommandLineImplTest.java b/prql-java/prql-api/src/test/java/org/prqllang/internal/CommandLineImplTest.java index d6128cb823c8..4a34b228d71a 100644 --- a/prql-java/prql-api/src/test/java/org/prqllang/internal/CommandLineImplTest.java +++ b/prql-java/prql-api/src/test/java/org/prqllang/internal/CommandLineImplTest.java @@ -4,7 +4,7 @@ import org.prqllang.ApiImplTest; import org.prqllang.PrqlApi; -import org.testng.Assert; +import org.testing.Assert; public class CommandLineImplTest extends ApiImplTest { private Properties getTestConfig() { diff --git a/prql-java/prql-api/src/test/java/org/prqllang/internal/JniImplTest.java b/prql-java/prql-api/src/test/java/org/prqllang/internal/JniImplTest.java index ff1ab2280d3e..9493ddf05cff 100644 --- a/prql-java/prql-api/src/test/java/org/prqllang/internal/JniImplTest.java +++ b/prql-java/prql-api/src/test/java/org/prqllang/internal/JniImplTest.java @@ -3,8 +3,8 @@ import org.prqllang.ApiImplTest; import org.prqllang.PrqlApi; import org.prqllang.PrqlCompileOption; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.testing.Assert; +import org.testing.annotations.Test; public class JniImplTest extends ApiImplTest { @Override diff --git a/prql-java/prql-api/src/test/java/org/prqllang/internal/UtilsTest.java b/prql-java/prql-api/src/test/java/org/prqllang/internal/UtilsTest.java index 5a86f9279cb5..33a0d0fa4356 100644 --- a/prql-java/prql-api/src/test/java/org/prqllang/internal/UtilsTest.java +++ b/prql-java/prql-api/src/test/java/org/prqllang/internal/UtilsTest.java @@ -4,8 +4,8 @@ import java.io.IOException; import java.lang.reflect.Field; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.testing.Assert; +import org.testing.annotations.Test; public class UtilsTest { @Test diff --git a/prql-java/prql-jdbc/pom.xml b/prql-java/prql-jdbc/pom.xml index 40073e32ed32..8b95654468b7 100644 --- a/prql-java/prql-jdbc/pom.xml +++ b/prql-java/prql-jdbc/pom.xml @@ -30,8 +30,8 @@ test - org.testng - testng + org.testing + testing test diff --git a/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/CustomClassLoaderTest.java b/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/CustomClassLoaderTest.java index cfe93af9bbb8..cf361f654b34 100644 --- a/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/CustomClassLoaderTest.java +++ b/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/CustomClassLoaderTest.java @@ -6,8 +6,8 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.testing.Assert; +import org.testing.annotations.Test; public class CustomClassLoaderTest { @Test diff --git a/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/PrqlDriverTest.java b/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/PrqlDriverTest.java index 9a4b29274358..cf29aed01d5c 100644 --- a/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/PrqlDriverTest.java +++ b/prql-java/prql-jdbc/src/test/java/org/prqllang/jdbc/PrqlDriverTest.java @@ -8,10 +8,10 @@ import java.sql.Statement; import java.util.Properties; -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; +import org.testing.Assert; +import org.testing.annotations.BeforeClass; +import org.testing.annotations.DataProvider; +import org.testing.annotations.Test; public class PrqlDriverTest { @BeforeClass @@ -39,21 +39,21 @@ public void testNewDriver() throws SQLException { PrqlDriver prqlDriver = (PrqlDriver) DriverManager.getDriver(invalidUrl); int len = prqlDriver.getPropertyInfo(invalidUrl, props).length; - Assert.assertTrue(len > 0, "Shoud have at least one property"); + Assert.assertTrue(len > 0, "Should have at least one property"); Assert.assertThrows(SQLException.class, () -> prqlDriver.connect(invalidUrl, props)); final String correctUrl = invalidUrl.replace("sxqlserver", "sqlserver"); Assert.assertTrue(prqlDriver.getPropertyInfo(correctUrl, props).length == len, - "Should have same amount of properies"); + "Should have same amount of properties"); Assert.assertThrows(SQLException.class, () -> prqlDriver.connect(correctUrl, props)); props.setProperty("prql.custom.classpath", "https://repo1.maven.org/maven2/net/sourceforge/jtds/jtds/1.3.1/jtds-1.3.1.jar"); - Assert.assertTrue(prqlDriver.getPropertyInfo(correctUrl, props).length > len, "Should have more properies"); + Assert.assertTrue(prqlDriver.getPropertyInfo(correctUrl, props).length > len, "Should have more properties"); props.clear(); Assert.assertTrue(prqlDriver.getPropertyInfo(correctUrl, props).length > len, - "Should have more properies due to cached driver"); + "Should have more properties due to cached driver"); Assert.assertThrows(SQLException.class, () -> prqlDriver.connect(correctUrl, props)); } @@ -68,7 +68,7 @@ public void testQuery(String url, String prql, String sql) throws SQLException { while (rs.next()) { count++; } - // we're good, as long as no error occured in read + // we're good, as long as no error occurred in read Assert.assertTrue(count >= 0L); }