@@ -69,37 +69,13 @@ FOSSIL_TEST(c_test_myshell_open_create_close) {
6969 remove (file_name );
7070}
7171
72- FOSSIL_TEST (c_test_myshell_put_get_del ) {
73- fossil_bluecrab_myshell_error_t err ;
74- const char * file_name = "test3.myshell" ;
75- fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
76- ASSUME_ITS_TRUE (db != NULL );
77-
78- err = fossil_myshell_put (db , "foo" , "bar" );
79- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
80-
81- char value [128 ];
82- err = fossil_myshell_get (db , "foo" , value , sizeof (value ));
83- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
84- ASSUME_ITS_EQUAL_CSTR (value , "bar" );
85-
86- err = fossil_myshell_del (db , "foo" );
87- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
88-
89- err = fossil_myshell_get (db , "foo" , value , sizeof (value ));
90- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_NOT_FOUND );
91-
92- fossil_myshell_close (db );
93- remove (file_name );
94- }
95-
9672FOSSIL_TEST (c_test_myshell_commit_branch_checkout ) {
9773 fossil_bluecrab_myshell_error_t err ;
9874 const char * file_name = "test4.myshell" ;
9975 fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
10076 ASSUME_ITS_TRUE (db != NULL );
10177
102- err = fossil_myshell_put (db , "key" , "val" );
78+ err = fossil_myshell_put (db , "key" , "cstr" , " val" );
10379 ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
10480
10581 err = fossil_myshell_commit (db , "Initial commit" );
@@ -115,59 +91,6 @@ FOSSIL_TEST(c_test_myshell_commit_branch_checkout) {
11591 remove (file_name );
11692}
11793
118- FOSSIL_TEST (c_test_myshell_log_history ) {
119- fossil_bluecrab_myshell_error_t err ;
120- const char * file_name = "test5.myshell" ;
121- fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
122- ASSUME_ITS_TRUE (db != NULL );
123-
124- fossil_myshell_commit (db , "Commit 1" );
125- fossil_myshell_commit (db , "Commit 2" );
126- fossil_myshell_commit (db , "Commit 3" );
127-
128- int count = 0 ;
129- err = fossil_myshell_log (db , log_cb , & count );
130- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
131- ASSUME_ITS_TRUE (count == 3 );
132-
133- fossil_myshell_close (db );
134- remove (file_name );
135- }
136-
137- FOSSIL_TEST (c_test_myshell_backup_restore ) {
138- fossil_bluecrab_myshell_error_t err ;
139- const char * file_name = "test6.myshell" ;
140- const char * backup_name = "test6_backup.myshell" ;
141- const char * restore_name = "test6_restored.myshell" ;
142-
143- fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
144- ASSUME_ITS_TRUE (db != NULL );
145-
146- fossil_myshell_put (db , "a" , "b" );
147- fossil_myshell_commit (db , "Backup commit" );
148-
149- err = fossil_myshell_backup (db , backup_name );
150- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
151-
152- fossil_myshell_close (db );
153-
154- err = fossil_myshell_restore (backup_name , restore_name );
155- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
156-
157- fossil_bluecrab_myshell_t * db2 = fossil_myshell_open (restore_name , & err );
158- ASSUME_ITS_TRUE (db2 != NULL );
159-
160- char value [32 ];
161- err = fossil_myshell_get (db2 , "a" , value , sizeof (value ));
162- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
163- ASSUME_ITS_EQUAL_CSTR (value , "b" );
164-
165- fossil_myshell_close (db2 );
166- remove (file_name );
167- remove (backup_name );
168- remove (restore_name );
169- }
170-
17194FOSSIL_TEST (c_test_myshell_errstr ) {
17295 ASSUME_ITS_EQUAL_CSTR (fossil_myshell_errstr (FOSSIL_MYSHELL_ERROR_SUCCESS ), "Success" );
17396 ASSUME_ITS_EQUAL_CSTR (fossil_myshell_errstr (FOSSIL_MYSHELL_ERROR_NOT_FOUND ), "Not found" );
@@ -177,36 +100,13 @@ FOSSIL_TEST(c_test_myshell_errstr) {
177100
178101// Edge case tests for myshell
179102
180- FOSSIL_TEST (c_test_myshell_empty_strings ) {
181- fossil_bluecrab_myshell_error_t err ;
182- const char * file_name = "emptystr.myshell" ;
183- fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
184- ASSUME_ITS_TRUE (db != NULL );
185-
186- // Empty key
187- err = fossil_myshell_put (db , "" , "value" );
188- ASSUME_ITS_TRUE (err != FOSSIL_MYSHELL_ERROR_SUCCESS );
189-
190- // Empty value
191- err = fossil_myshell_put (db , "key" , "" );
192- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
193-
194- char value [16 ];
195- err = fossil_myshell_get (db , "key" , value , sizeof (value ));
196- ASSUME_ITS_TRUE (err == FOSSIL_MYSHELL_ERROR_SUCCESS );
197- ASSUME_ITS_EQUAL_CSTR (value , "" );
198-
199- fossil_myshell_close (db );
200- remove (file_name );
201- }
202-
203103FOSSIL_TEST (c_test_myshell_corrupted_key_hash ) {
204104 fossil_bluecrab_myshell_error_t err ;
205105 const char * file_name = "corrupt_key.myshell" ;
206106 fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
207107 ASSUME_ITS_TRUE (db != NULL );
208108
209- fossil_myshell_put (db , "corruptkey" , "corruptval" );
109+ fossil_myshell_put (db , "corruptkey" , "cstr" , " corruptval" );
210110 fossil_myshell_commit (db , "commit" );
211111
212112 fossil_myshell_close (db );
@@ -243,7 +143,7 @@ FOSSIL_TEST(c_test_myshell_corrupted_file_size) {
243143 fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
244144 ASSUME_ITS_TRUE (db != NULL );
245145
246- fossil_myshell_put (db , "sizekey" , "sizeval" );
146+ fossil_myshell_put (db , "sizekey" , "cstr" , " sizeval" );
247147 fossil_myshell_commit (db , "commit" );
248148
249149 // Artificially change db->file_size to simulate corruption
@@ -262,7 +162,7 @@ FOSSIL_TEST(c_test_myshell_parse_failed_commit) {
262162 fossil_bluecrab_myshell_t * db = fossil_myshell_create (file_name , & err );
263163 ASSUME_ITS_TRUE (db != NULL );
264164
265- fossil_myshell_put (db , "parsekey" , "parseval" );
165+ fossil_myshell_put (db , "parsekey" , "cstr" , " parseval" );
266166 fossil_myshell_commit (db , "parse commit" );
267167
268168 fossil_myshell_close (db );
@@ -307,12 +207,8 @@ FOSSIL_TEST(c_test_myshell_parse_failed_commit) {
307207// * * * * * * * * * * * * * * * * * * * * * * * *
308208FOSSIL_TEST_GROUP (c_myshell_database_tests ) {
309209 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_open_create_close );
310- FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_put_get_del );
311210 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_commit_branch_checkout );
312- FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_log_history );
313- FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_backup_restore );
314211 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_errstr );
315- FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_empty_strings );
316212 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_corrupted_key_hash );
317213 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_corrupted_file_size );
318214 FOSSIL_TEST_ADD (c_myshell_fixture , c_test_myshell_parse_failed_commit );
0 commit comments