Add a visual indicator (emoji) to TestScript verbose messages, dependent on the messa...

FossilOrigin-Name: dc323d3894f2d53470cd8be261632267fa3d2af73500acfa1e9adbfa53b771fd

diff --git a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
index f9d60b715f239f9b42cd594fe66991e119a8b19b..685d89b039e96acacb758046b3db0d87262fd776 100644 (file)
--- a/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
+++ b/ext/jni/src/org/sqlite/jni/tester/SQLTester.java
@@ -780,7 +780,7 @@ class GlobCommand extends Command {
                        ResultRowMode.ONELINE, sql);
     final String result = t.getResultText();
     final String sArgs = Util.argvToString(argv);
-    //t.verbose(argv[0]," rc = ",rc," result buffer:\n", result,"\nargs:\n",sArgs);
+    //t2.verbose2(argv[0]," rc = ",rc," result buffer:\n", result,"\nargs:\n",sArgs);
     final String glob = Util.argvToString(argv);
     rc = SQLTester.strglob(glob, result);
     if( (negate && 0==rc) || (!negate && 0!=rc) ){
@@ -861,7 +861,7 @@ class ResultCommand extends Command {
     argcCheck(ts,argv,0,-1);
     t.incrementTestCounter();
     final String sql = t.takeInputBuffer();
-    //t.verbose(argv[0]," SQL =\n",sql);
+    //ts.verbose2(argv[0]," SQL =\n",sql);
     int rc = t.execSql(null, false, bufferMode, ResultRowMode.ONELINE, sql);
     final String result = t.getResultText().trim();
     final String sArgs = argv.length>1 ? Util.argvToString(argv) : "";
@@ -884,8 +884,8 @@ class RunCommand extends Command {
                        ResultRowMode.ONELINE, sql);
     if( 0!=rc && t.isVerbose() ){
       String msg = sqlite3_errmsg(db);
-      t.verbose(argv[0]," non-fatal command error #",rc,": ",
-                msg,"\nfor SQL:\n",sql);
+      ts.verbose1(argv[0]," non-fatal command error #",rc,": ",
+                  msg,"\nfor SQL:\n",sql);
     }
   }
 }
@@ -924,7 +924,7 @@ class TableResultCommand extends Command {
     }
     for(int i = 0; i < res.length; ++i){
       final String glob = globs[i].replaceAll("\\s+"," ").trim();
-      //t.verbose(argv[0]," <<",glob,">> vs <<",res[i],">>");
+      //ts.verbose2(argv[0]," <<",glob,">> vs <<",res[i],">>");
       if( jsonMode ){
         if( !glob.equals(res[i]) ){
           ts.toss(argv[0], " json <<",glob, ">> does not match: <<",
@@ -1085,20 +1085,20 @@ class TestScript {
     return rc + " line "+ cur.lineNo;
   }
 
+  static final String[] verboseLabel = {"🔈",/*"🔉",*/"🔊","📢"};
   //! Output vals only if level<=current verbosity level.
   private TestScript verboseN(int level, Object... vals){
     final int verbosity = outer.getVerbosity();
     if(verbosity>=level){
-      outer.out(
-        "VERBOSE", (verbosity>1 ? "+ " : " "), getOutputPrefix(), ": "
+      outer.out( verboseLabel[level-1], getOutputPrefix(), " ",level,": "
       ).outln(vals);
     }
     return this;
   }
 
-  private TestScript verbose1(Object... vals){return verboseN(1,vals);}
-  private TestScript verbose2(Object... vals){return verboseN(2,vals);}
-  private TestScript verbose3(Object... vals){return verboseN(3,vals);}
+  TestScript verbose1(Object... vals){return verboseN(1,vals);}
+  TestScript verbose2(Object... vals){return verboseN(2,vals);}
+  TestScript verbose3(Object... vals){return verboseN(3,vals);}
 
   private void reset(){
     testCaseName = null;

diff --git a/manifest b/manifest
index be35dea7b4831f5f78047836bda6621c77817cf8..3fdf78c78f34cb21dadf51d70801aa1cd0640b3b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\scurrent\s--testcase\sname\sto\sSQLTester\s--verbose\soutput.
-D 2023-08-10T10:44:53.161
+C Add\sa\svisual\sindicator\s(emoji)\sto\sTestScript\sverbose\smessages,\sdependent\son\sthe\smessage's\slevel\sof\sverbosity.
+D 2023-08-10T10:58:55.662
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -266,7 +266,7 @@ F ext/jni/src/org/sqlite/jni/sqlite3.java 62b1b81935ccf3393472d17cb883dc5ff39c38
 F ext/jni/src/org/sqlite/jni/sqlite3_context.java d26573fc7b309228cb49786e9078597d96232257defa955a3425d10897bca810
 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/SQLTester.java a53136bc757eb46fe5d404d93ffef5fa16bd60957f40b446a320eded81ea8295
+F ext/jni/src/org/sqlite/jni/tester/SQLTester.java 8f547b7c1c440b6fae4546308a93d9c81f42165743a011ba27aee44b487ae19e
 F ext/jni/src/org/sqlite/jni/tester/test-script-interpreter.md f9f25126127045d051e918fe59004a1485311c50a13edbf18c79a6ff9160030e
 F ext/jni/src/tests/000-000-sanity.test 35817746f1909cc9af5d3e890ee94a43c47ce47127da9cca7d39b0e132d36c84
 F ext/jni/src/tests/000-001-ignored.test e17e874c6ab3c437f1293d88093cf06286083b65bf162317f91bbfd92f961b70
@@ -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 8dd08021496f504c23945ecc2bbe1e4a13109fdd03457ca6269b4cb1cc4cd04c
-R 6945d572bb09d06283928530ca319652
+P f87367402b25adf30f35ab75aa5efc495230d4a83f2fc10b99734c3f3f593840
+R a7620ac844ee78dbe35574ca68ee4232
 U stephan
-Z 7ed984402281dd637927941ca5072ed3
+Z 9d16676db12b9f3723b82b6122641cb8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 772c64c19e99a8cac53f65cb63696f18c9d1b36d..f4a29c6de00a17162d3e1fd9907cc205e9196c8f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f87367402b25adf30f35ab75aa5efc495230d4a83f2fc10b99734c3f3f593840
\ No newline at end of file
+dc323d3894f2d53470cd8be261632267fa3d2af73500acfa1e9adbfa53b771fd
\ No newline at end of file