From 49e1125b69c36bfeee34424792ad7ffe0a8ed060 Mon Sep 17 00:00:00 2001
From: mistachkin <mistachkin@noemail.net>
Date: Mon, 4 Apr 2016 15:47:46 +0000
Subject: [PATCH] Add and enhance the new tests.

FossilOrigin-Name: f4cbd18db47af4af990d7891dcc831e92b3f17e0
---
 manifest         | 12 ++++++------
 manifest.uuid    |  2 +-
 test/shell1.test | 24 +++++++++++++++++++++---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 050c3442d2..451d4e5fdc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refinements\sto\sthe\sprevious\scheck-in.
-D 2016-04-04T02:33:34.200
+C Add\sand\senhance\sthe\snew\stests.
+D 2016-04-04T15:47:46.571
 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
@@ -1049,7 +1049,7 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
 F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test b110f092f64193c7235abd07bab79f1a59f494b1
+F test/shell1.test a216486c6aeae4d3e75e37d64e4b6c8974108750
 F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b
 F test/shell3.test da513d522ef6f01cee8475dcf8332bff8982b3dd
 F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
@@ -1480,7 +1480,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 74183a5f803999e1d4e288851c72519c3c53f6b5
-R dc99ab499cebc95aed1812a7f9308be8
+P b36dfdff787dc4a107b2c3fcbb98bfc4922872d8
+R 37b07e38c129266922b712e67867cec6
 U mistachkin
-Z 71f87a99a345de92d46f0c5169631d32
+Z 3608507dbf100776dbeda9a8b2f0dd8b
diff --git a/manifest.uuid b/manifest.uuid
index 08c1c3a431..6c13ec95df 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b36dfdff787dc4a107b2c3fcbb98bfc4922872d8
\ No newline at end of file
+f4cbd18db47af4af990d7891dcc831e92b3f17e0
\ No newline at end of file
diff --git a/test/shell1.test b/test/shell1.test
index 476af064a5..36b61c819e 100644
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -910,10 +910,13 @@ do_test shell1-5.0 {
   }
 } {}
 
+# The string used here is the word "test" in Chinese.
+# In UTF-8, it is encoded as: \xE6\xB5\x8B\xE8\xAF\x95
+set test \u6D4B\u8BD5
+
 do_test shell1-6.0 {
-  # The base file name here is the word "test" in Chinese.
-  # In UTF-8, it is encoded as: \xE6\xB5\x8B\xE8\xAF\x95
-  set fileName \u6D4B\u8BD5; append fileName .db
+  set fileName $test; append fileName .db
+  catch {forcedelete $fileName}
   set x [catchcmdex $fileName "CREATE TABLE t1(x);\n.schema\n"]
   set code [lindex $x 0]
   set res [string trim [lindex $x 1]]
@@ -929,4 +932,19 @@ do_test shell1-6.0 {
   forcedelete $fileName
 } {}
 
+do_test shell1-6.1 {
+  catch {forcedelete test3.db}
+  set x [catchcmdex test3.db \
+      "CREATE TABLE [encoding convertto utf-8 $test](x);\n.schema\n"]
+  set code [lindex $x 0]
+  set res [string trim [lindex $x 1]]
+  if {$code ne "0"} {
+    error "failed with error: $res"
+  }
+  if {$res ne "CREATE TABLE ${test}(x);"} {
+    error "failed with mismatch: $res"
+  }
+  forcedelete test3.db
+} {}
+
 finish_test
-- 
2.39.5