JNI test code cleanups.

FossilOrigin-Name: 09142ac14347e6f41bbe50bc835920e271713452733a478ede547816cc291ace

diff --git a/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java b/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
index 681712f96f6aa42514ae217058b5bf0efd206e43..a428c3e247eb937d123008e5e3990ee490bcd39b 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
+++ b/ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java
@@ -12,14 +12,13 @@
 ** This file contains a set of tests for the sqlite3 JNI bindings.
 */
 package org.sqlite.jni.wrapper1;
-//import static org.sqlite.jni.capi.CApi.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import org.sqlite.jni.capi.*;
+import org.sqlite.jni.capi.CApi;
 
 /**
    An annotation for Tester2 tests which we do not want to run in
@@ -167,14 +166,6 @@ public class Tester2 implements Runnable {
     affirm(Sqlite.libVersionNumber() == CApi.SQLITE_VERSION_NUMBER);
   }
 
-  /* Copy/paste/rename this to add new tests. */
-  private void _testTemplate(){
-    //final sqlite3 db = createNewDb();
-    //sqlite3_stmt stmt = prepare(db,"SELECT 1");
-    //sqlite3_finalize(stmt);
-    //sqlite3_close_v2(db);
-  }
-
   private void nap() throws InterruptedException {
     if( takeNaps ){
       Thread.sleep(java.util.concurrent.ThreadLocalRandom.current().nextInt(3, 17), 0);
@@ -948,6 +939,15 @@ public class Tester2 implements Runnable {
     affirm( 9 == fCount.value );
   }
 
+
+  /* Copy/paste/rename this to add new tests. */
+  private void _testTemplate(){
+    try (Sqlite db = openDb()) {
+      Sqlite.Stmt stmt = db.prepare("SELECT 1");
+      stmt.finalizeStmt();
+    }
+  }
+
   private void runTests(boolean fromThread) throws Exception {
     List<java.lang.reflect.Method> mlist = testMethods;
     affirm( null!=mlist );

diff --git a/manifest b/manifest
index dc9fb1a27b3afdfbbc0cee7ac2c3d056f91ad48c..c3b250a2bbdadd8134ddc0bf95503a767f82e525 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JNI:\sadd\sCONFIG_LOG\sand\sCONFIG_SQLLOG\ssupport\sto\swrapper1.\sCode-adjacent\scleanups.
-D 2023-11-15T04:55:38.215
+C JNI\stest\scode\scleanups.
+D 2023-11-15T05:08:39.794
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -257,7 +257,7 @@ F ext/jni/src/org/sqlite/jni/capi/CollationCallback.java e29bcfc540fdd343e2f5cca
 F ext/jni/src/org/sqlite/jni/capi/CollationNeededCallback.java 5bfa226a8e7a92e804fd52d6e42b4c7b875fa7a94f8e2c330af8cc244a8920ab
 F ext/jni/src/org/sqlite/jni/capi/CommitHookCallback.java 482f53dfec9e3ac2a9070d3fceebd56250932aaaf7c4f5bc8de29fc011416e0c
 F ext/jni/src/org/sqlite/jni/capi/ConfigLogCallback.java b995ca412f59b631803b93aa5b3684fce62e335d1e123207084c054abfd488d4
-F ext/jni/src/org/sqlite/jni/capi/ConfigSqlLogCallback.java e5723900b6458bc6288f52187090a78ebe0a20f403ac7c887ec9061dfe51aba7 w ext/jni/src/org/sqlite/jni/capi/ConfigSqllogCallback.java
+F ext/jni/src/org/sqlite/jni/capi/ConfigSqlLogCallback.java e5723900b6458bc6288f52187090a78ebe0a20f403ac7c887ec9061dfe51aba7
 F ext/jni/src/org/sqlite/jni/capi/NativePointerHolder.java b7036dcb1ef1b39f1f36ac605dde0ff1a24a9a01ade6aa1a605039443e089a61
 F ext/jni/src/org/sqlite/jni/capi/OutputPointer.java 246b0e66c4603f41c567105a21189d138aaf8c58203ecd4928802333da553e7c
 F ext/jni/src/org/sqlite/jni/capi/PrepareMultiCallback.java 97352091abd7556167f4799076396279a51749fdae2b72a6ba61cd39b3df0359
@@ -298,7 +298,7 @@ F ext/jni/src/org/sqlite/jni/wrapper1/ScalarFunction.java 43c43adfb7866098aadaac
 F ext/jni/src/org/sqlite/jni/wrapper1/SqlFunction.java 27b141f5914c7cb0e40e90a301d5e05b77f3bd42236834a68031b7086381fafd
 F ext/jni/src/org/sqlite/jni/wrapper1/Sqlite.java 75d4145e7843211f21815e43dfcecf862427558017e586ac3aad02e9bb8419d5
 F ext/jni/src/org/sqlite/jni/wrapper1/SqliteException.java 982538ddb4c0719ef87dfa664cd137b09890b546029a7477810bd64d4c47ee35
-F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java 65b0b2403ffa246e192053d68dad03c08b71d02ed519ab20d00349288f043ba8
+F ext/jni/src/org/sqlite/jni/wrapper1/Tester2.java 5e42e6d62aa87409ddbee093b83946c2740b6ac2a39e4868f6a27987677f6a17
 F ext/jni/src/org/sqlite/jni/wrapper1/ValueHolder.java a84e90c43724a69c2ecebd601bc8e5139f869b7d08cb705c77ef757dacdd0593
 F ext/jni/src/org/sqlite/jni/wrapper1/WindowFunction.java c7d1452f9ff26175b3c19bbf273116cc2846610af68e01756d755f037fe7319f
 F ext/jni/src/tests/000-000-sanity.test c3427a0e0ac84d7cbe4c95fdc1cd4b61f9ddcf43443408f3000139478c4dc745
@@ -2139,8 +2139,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 24f20663b1c4e13ff7d9a89e1df6af2e6f5730e5042ae6479e0a8c1bb846f313
-R 5e5e2777e702141d6b5a89b8a84ebc98
+P 83c49b9e71e5ae8852bab60a6fa630e22164c8efbf074c85450136781d0fffd3
+R 11f7f6d131495fb464d838c1bb741013
 U stephan
-Z 596e886ed57615c1aee46aef2bbca180
+Z c06836e611da7dd2a6fb9a46b70f157f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f5e6e965112f0769bd4ad0a94a812c4ec0810612..732bdde6affae47b53cdbf0bde5fb1bb705c17e9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-83c49b9e71e5ae8852bab60a6fa630e22164c8efbf074c85450136781d0fffd3
\ No newline at end of file
+09142ac14347e6f41bbe50bc835920e271713452733a478ede547816cc291ace
\ No newline at end of file