Rework SQLTester dispatching and add stub impls for several commmands.

FossilOrigin-Name: 9e61af75ac83e74487a6ae681ee3ff891d8cf1f1d23bf895e9e3963ddf6eaf28

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index 9ff5bc1ff44a425423b6b304867c80e55f7c6daa..441383ca0acb0fd85c076fc69927f21857bcba18 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -29,6 +29,7 @@ public class SQLTester {
   private final java.util.List<String> listInFiles = new ArrayList<>();
   private final Outer outer = new Outer();
   private final StringBuilder inputBuffer = new StringBuilder();
+  private String nullView = "nil";
 
   public SQLTester(){
   }
@@ -68,10 +69,22 @@ public class SQLTester {
     this.inputBuffer.delete(0, this.inputBuffer.length());
   }
 
+  String getInputBuffer(){
+    return inputBuffer.toString();
+  }
+
+  String takeInputBuffer(){
+    final String rc = inputBuffer.toString();
+    resetInputBuffer();
+    return rc;
+  }
+
   void reset(){
     this.resetInputBuffer();
   }
 
+  void setNullValue(String v){nullView = v;}
+
   public static void main(String[] argv) throws Exception{
     final SQLTester t = new SQLTester();
     for(String a : argv){
@@ -91,42 +104,93 @@ public class SQLTester {
   }
 }
 
-abstract class Command {
-  private SQLTester tester;
+class Command {
+  protected SQLTester tester;
   Command(SQLTester t){tester = t;}
-  public SQLTester getTester(){return tester;}
 
-  public abstract void process(String[] argv, String content);
-}
+  protected final void badArg(String... msg){
+    StringBuilder sb = new StringBuilder();
+    int i = 0;
+    for(String s : msg) sb.append(((0==i++) ? "" : " ")+s);
+    throw new IllegalArgumentException(sb.toString());
+  }
 
-class NullCommand extends Command {
-  public NullCommand(SQLTester t){super(t);}
+  protected final void argcCheck(String[] argv, int min, int max){
+    int argc = argv.length-1;
+    if(argc<min || argc>max){
+      if( min==max ) badArg(argv[0],"requires exactly",""+min,"argument(s)");
+      else badArg(argv[0],"requires",""+min,"-",""+max,"arguments.");
+    }
+  }
+
+  protected final void argcCheck(String[] argv, int argc){
+    argcCheck(argv, argc, argc);
+  }
 
-  public void process(String[] argv, String content){
+  protected void affirmNoContent(String content){
+    if(null != content){
+      badArg(this.getClass().getName(),"does not accept content.");
+    }
   }
 }
 
-class TestCaseCommand extends Command {
-  public TestCaseCommand(SQLTester t){super(t);}
+class DbCommand extends Command {
+  public DbCommand(SQLTester t, String[] argv, String content){
+    super(t);
+    argcCheck(argv,1);
+    affirmNoContent(content);
+    //t.verbose(argv[0],argv[1]);
+  }
+}
 
-  public void process(String[] argv, String content){
+class NullCommand extends Command {
+  public NullCommand(SQLTester t, String[] argv, String content){
+    super(t);
+    argcCheck(argv,1);
+    affirmNoContent(content);
+    tester.setNullValue(argv[1]);
+    //t.verbose(argv[0],argv[1]);
   }
 }
 
 class ResultCommand extends Command {
-  public ResultCommand(SQLTester t){super(t);}
+  public ResultCommand(SQLTester t, String[] argv, String content){
+    super(t);
+    argcCheck(argv,0);
+    t.verbose(argv[0],"command is TODO");
+  }
+}
 
-  public void process(String[] argv, String content){
+class TestCaseCommand extends Command {
+  public TestCaseCommand(SQLTester t, String[] argv, String content){
+    super(t);
+    argcCheck(argv,1);
+    t.verbose(argv[0],argv[1]);
   }
 }
 
-class CommandFactory {
-  static Command getCommandByName(SQLTester t, String name){
+class CommandDispatcher {
+  static Class getCommandByName(String name){
     switch(name){
-      case "null": return new NullCommand(t);
-      case "result": return new ResultCommand(t);
-      case "testcase": return new TestCaseCommand(t);
+      case "db": return DbCommand.class;
+      case "null": return NullCommand.class;
+      case "result": return ResultCommand.class;
+      case "testcase": return TestCaseCommand.class;
       default: return null;
     }
   }
+
+  @SuppressWarnings("unchecked")
+  static void dispatch(SQLTester tester, String[] argv, String content) throws Exception{
+    final Class cmdClass = getCommandByName(argv[0]);
+    if(null == cmdClass){
+      throw new IllegalArgumentException(
+        "No command handler found for '"+argv[0]+"'"
+      );
+    }
+    final java.lang.reflect.Constructor<Command> ctor =
+      cmdClass.getConstructor(SQLTester.class, String[].class, String.class);
+    tester.verbose("Running",cmdClass.getSimpleName(),"...");
+    ctor.newInstance(tester, argv, content);
+  }
 }

diff --git a/ext/jni/src/org/sqlite/jni/tester/TestScript.java b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
index 69482290840077b3f14046e91cb25a866b613e49..c94e348880aa585f79258e32fe46f06c4bc3d8b3 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/TestScript.java
+++ b/ext/jni/src/org/sqlite/jni/tester/TestScript.java
@@ -165,25 +165,15 @@ public class TestScript {
     if( null==chunks ){
       verbose("This contains content which forces it to be ignored.");
     }else{
-      verbose("script commands:");
       int n = 0;
       for(String chunk : chunks){
         ++n;
         //verbose("#"+n,c).verbose("<EOF>");
-        String[] parts = chunk.split("\\n", 2);
-        String[] argv = parts[0].split("\\s+");
-        Command cmd = CommandFactory.getCommandByName(tester, argv[0]);
-        verbose("Command #"+n,argv[0],":",
-                (null==cmd ? "null" : cmd.getClass().getName()));
-        if(null == cmd){
-          throw new IllegalArgumentException(
-            "No command handler found for '"+argv[0]+"'"
-          );
-        }
-        if( parts.length > 1 ){
-          verbose(parts[1]).verbose("<EOF>");
-        }
-        cmd.process(argv, parts.length>1 ? parts[1] : null);
+        final String[] parts = chunk.split("\\n", 2);
+        final String[] argv = parts[0].split("\\s+");
+        CommandDispatcher.dispatch(
+          tester, argv, parts.length>1 ? parts[1] : null
+        );
       }
     }
   }

diff --git a/ext/jni/src/tests/000_first.test b/ext/jni/src/tests/000_first.test
index b6744e74a7b959c29e13219134b0b33680479092..58ad6e7013f4e6cebb0fed5315edcfbd529b6269 100644 (file)
--- a/ext/jni/src/tests/000_first.test
+++ b/ext/jni/src/tests/000_first.test
@@ -4,7 +4,8 @@
 
 junk
 
---null NULL
+--null zilch
+--db 1
 --- also ignored
 --testcase first
 input for the first

diff --git a/manifest b/manifest
index b453204c181325c0196e2191b1470a7e188d4ead..c4e0df940e729f57b06d30590dd2aea4ff0ffcf8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\scommand\sdispatcher\sto\sSQLTester.
-D 2023-08-07T23:59:08.259
+C Rework\sSQLTester\sdispatching\sand\sadd\sstub\simpls\sfor\sseveral\scommmands.
+D 2023-08-08T00:37:31.945
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -265,10 +265,10 @@ F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e907859
 F ext/jni/src/org/sqlite/jni/sqlite3_stmt.java 78e6d1b95ac600a9475e9db4623f69449322b0c93d1bd4e1616e76ed547ed9fc
 F ext/jni/src/org/sqlite/jni/sqlite3_value.java 3d1d4903e267bc0bc81d57d21f5e85978eff389a1a6ed46726dbe75f85e6914a
 F ext/jni/src/org/sqlite/jni/tester/Outer.java 8931ff9f152d22a822ff98831a4e924da48016ff1f1f84042390a6f51ad7b48f
-F ext/jni/src/org/sqlite/jni/tester/SQLTester.java e717d2117f9589f17af599e527c126733b13a2cfded3f47297ae37c02e62e9ab
-F ext/jni/src/org/sqlite/jni/tester/TestScript.java fa93b7abe11903412464b6cfbb6a2c44c738d4da291748ec99b28d3964bce846
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java c4cadc7d0a8c86a9369a55527d711558206f8d2cf0ee8e26c1c1167a247e9c16
+F ext/jni/src/org/sqlite/jni/tester/TestScript.java ed3cbc0371d0949293d9cc1925ce79d0d354fbe5282042dfbfe60c6e9d792fcd
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md 2627f8ac7c3d3f502404d9a9b8481bad5c2d11df7fdf25fbd0e1dbd2bcaa54c3
-F ext/jni/src/tests/000_first.test dad04b8e386bb5a33d02c9647a20229daccea9889ead58c70a723d5d179facea
+F ext/jni/src/tests/000_first.test 29cc4ab0fa97a296ba0e2a7d821f7869503eec52e0fdb9de6a536dd02dd01946
 F ext/jni/src/tests/010_ignored.test ce2de6742ff1bf98d8976fda0f260ff3d280e8f8c0a99309fb59fcfef2556fcd
 F ext/lsm1/Makefile a553b728bba6c11201b795188c5708915cc4290f02b7df6ba7e8c4c943fd5cd9
 F ext/lsm1/Makefile.msc f8c878b467232226de288da320e1ac71c131f5ec91e08b21f502303347260013
@@ -2089,8 +2089,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 ecaeee652aa2cc6893ded9231d7e9b2783465516016740b307b74e4e81598ae3
-R 248f12cc342cf395644ad37d3af803a2
+P e0a06931e91459ea43fed2954568bfafa7ad6b794fcff66e0d3bf0ed181db386
+R 6790dfdd79e39541015901c80293f883
 U stephan
-Z 328e43fc1d1558590d24a0a8fa1662fc
+Z 7dd3c312d5e23f2927529b8054c01871
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7c5d5bec8733b90da6284edaac8a518e65a4e028..96ab7475d98b81221fab47e2378f78488fa5cd3a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0a06931e91459ea43fed2954568bfafa7ad6b794fcff66e0d3bf0ed181db386
\ No newline at end of file
+9e61af75ac83e74487a6ae681ee3ff891d8cf1f1d23bf895e9e3963ddf6eaf28
\ No newline at end of file