Allow cipher tests to be disabled when not building with SQLiteMC

Willena · Oct 1, 2023 · 610ad94 · 610ad94
1 parent b2efd2f
commit 610ad94
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -186,7 +186,7 @@ jobs:
         run: |
           make native SQLITE_OBJ=${{ env.SQLITE_DIR }}/lib/libsqlite3.dylib SQLITE_HEADER=${{ env.SQLITE_DIR }}/include/sqlite3.h
       - name: Test
-        run: mvn --batch-mode --no-transfer-progress test
+        run: mvn --batch-mode --no-transfer-progress test -DdisableCipherTests=true
 
 #  release:
 #    name: Deploy

diff --git a/src/test/java/org/sqlite/mc/SQLiteMCChacha20ConfigTest.java b/src/test/java/org/sqlite/mc/SQLiteMCChacha20ConfigTest.java
@@ -5,8 +5,13 @@
 
 import java.math.BigInteger;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.sqlite.SQLiteConfig;
 
+@DisabledIfSystemProperty(
+        disabledReason = "SQLite3 binary not compatible with that test",
+        named = "disableCipherTests",
+        matches = "true")
 class SQLiteMCChacha20ConfigTest {
 
     private static final String unsaltedHexKeyValid =

diff --git a/src/test/java/org/sqlite/mc/SQLiteMCPragmaTest.java b/src/test/java/org/sqlite/mc/SQLiteMCPragmaTest.java
@@ -6,9 +6,14 @@
 import java.io.IOException;
 import java.sql.*;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.sqlite.SQLiteConfig;
 import org.sqlite.SQLiteException;
 
+@DisabledIfSystemProperty(
+        disabledReason = "SQLite3 binary not compatible with that test",
+        named = "disableCipherTests",
+        matches = "true")
 public class SQLiteMCPragmaTest {
 
     private static final String SQL_TABLE =

diff --git a/src/test/java/org/sqlite/mc/SQLiteMCSQLInterfaceTest.java b/src/test/java/org/sqlite/mc/SQLiteMCSQLInterfaceTest.java
@@ -6,8 +6,13 @@
 import java.io.IOException;
 import java.sql.*;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.sqlite.SQLiteException;
 
+@DisabledIfSystemProperty(
+        disabledReason = "SQLite3 binary not compatible with that test",
+        named = "disableCipherTests",
+        matches = "true")
 public class SQLiteMCSQLInterfaceTest {
 
     private static final String SQL_TABLE =

diff --git a/src/test/java/org/sqlite/mc/SQLiteMCSqlCipherConfigTest.java b/src/test/java/org/sqlite/mc/SQLiteMCSqlCipherConfigTest.java
@@ -10,8 +10,13 @@
 import java.sql.SQLException;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.sqlite.SQLiteConfig;
 
+@DisabledIfSystemProperty(
+        disabledReason = "SQLite3 binary not compatible with that test",
+        named = "disableCipherTests",
+        matches = "true")
 class SQLiteMCSqlCipherConfigTest {
 
     private static final String unsaltedHexKeyValid =

diff --git a/src/test/java/org/sqlite/mc/SQLiteMCURIInterfaceTest.java b/src/test/java/org/sqlite/mc/SQLiteMCURIInterfaceTest.java
@@ -7,8 +7,13 @@
 import java.net.URLEncoder;
 import java.sql.*;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.sqlite.SQLiteException;
 
+@DisabledIfSystemProperty(
+        disabledReason = "SQLite3 binary not compatible with that test",
+        named = "disableCipherTests",
+        matches = "true")
 public class SQLiteMCURIInterfaceTest {
 
     private static final String SQL_TABLE =