...

2025-09-27 07:17:06 +04:00
parent 1664c830c9
commit ba1ca13066
2 changed files with 15 additions and 225 deletions
--- a/lib/hero/herofs/factory.v
+++ b/lib/hero/herofs/factory.v
@@ -54,7 +54,7 @@ pub fn new(args DBArgs) !FSFactory {

 pub fn new_test() !FSFactory {
 	mut mydb := db.new_test()!
-	mut f := new(redisclient: mydb.redis)!
+	mut f := new(redis: mydb.redis)!
 	f.fs.db.redis.flushdb()!
 	return f
 }
@@ -67,13 +67,13 @@ pub fn new_fs(args FsArg) !Fs {

 pub fn new_fs_test() !Fs {
 	mut mydb := db.new_test()!
-	mut f := new(redisclient: mydb.redis)!
+	mut f := new(redis: mydb.redis)!
 	f.fs.db.redis.flushdb()!
 	return f.fs.new_get_set(name: 'test')!
 }

 pub fn delete_fs_test() ! {
 	mut mydb := db.new_test()!
-	mut f := new(redisclient: mydb.redis)!
+	mut f := new(redis: mydb.redis)!
 	f.fs.db.redis.flushdb()!
 }
--- a/lib/hero/herofs/fs_blob_test.v
+++ b/lib/hero/herofs/fs_blob_test.v
@@ -9,7 +9,6 @@ import json
 import freeflowuniverse.herolib.hero.herofs { FsBlob }

 fn test_fs_blob_new() ! {
-	// TODO: do it for each test and call it like this
 	mut factory := new_test()!
 	mut db_fs_blob := factory.fs_blob

@@ -28,10 +27,8 @@ fn test_fs_blob_new() ! {
 }

 fn test_fs_blob_crud_operations() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args := FsBlobArg{
 		data: 'CRUD Test Data'.bytes()
@@ -73,10 +70,8 @@ fn test_fs_blob_crud_operations() ! {
 }

 fn test_fs_blob_encoding_decoding() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args := FsBlobArg{
 		data: 'Encoding Decoding Test'.bytes()
@@ -102,10 +97,8 @@ fn test_fs_blob_encoding_decoding() ! {
 }

 fn test_fs_blob_type_name() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args := FsBlobArg{
 		data: 'Type Name Test'.bytes()
@@ -120,10 +113,8 @@ fn test_fs_blob_type_name() ! {
 }

 fn test_fs_blob_description() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args := FsBlobArg{
 		data: 'Description Test'.bytes()
@@ -145,10 +136,8 @@ fn test_fs_blob_description() ! {
 }

 fn test_fs_blob_example() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args := FsBlobArg{
 		data: 'Example Test'.bytes()
@@ -196,10 +185,8 @@ fn test_fs_blob_example() ! {
 }

 fn test_fs_blob_list() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
+	mut factory := new_test()!
+	mut db_fs_blob := factory.fs_blob

 	mut args1 := FsBlobArg{
 		data: 'Blob 1'.bytes()
@@ -220,200 +207,3 @@ fn test_fs_blob_list() ! {

 	println('✓ FsBlob list test passed!')
 }
-
-fn test_fs_blob_handle_get() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Get Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.id)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'get', params)!
-	assert resp.result.string() == json.encode(blob)
-
-	println('✓ FsBlob handle get test passed!')
-}
-
-fn test_fs_blob_handle_set() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Set Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-
-	params := json.encode(blob)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'set', params)!
-	assert resp.result.int() == 1 // Assuming ID 1 for the first set operation
-
-	println('✓ FsBlob handle set test passed!')
-}
-
-fn test_fs_blob_handle_delete() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Delete Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.id)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'delete', params)!
-	assert resp.result.string() == 'true'
-
-	exists := db_fs_blob.exist(blob.id)!
-	assert exists == false
-
-	println('✓ FsBlob handle delete test passed!')
-}
-
-fn test_fs_blob_handle_exist() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Exist Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.id)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'exist', params)!
-	assert resp.result.string() == 'true'
-
-	db_fs_blob.delete(blob.id)!
-	resp_false := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'exist', params)!
-	assert resp_false.result.string() == 'false'
-
-	println('✓ FsBlob handle exist test passed!')
-}
-
-fn test_fs_blob_handle_list() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args1 := FsBlobArg{
-		data: 'Handle List Test 1'.bytes()
-	}
-	mut blob1 := db_fs_blob.new(args1)!
-	blob1 = db_fs_blob.set(blob1)!
-
-	mut args2 := FsBlobArg{
-		data: 'Handle List Test 2'.bytes()
-	}
-	mut blob2 := db_fs_blob.new(args2)!
-	blob2 = db_fs_blob.set(blob2)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'list', '{}')!
-	mut expected_list := [FsBlob(blob1), FsBlob(blob2)]
-	assert resp.result.string() == json.encode(expected_list)
-
-	println('✓ FsBlob handle list test passed!')
-}
-
-fn test_fs_blob_handle_get_by_hash() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Get By Hash Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.hash)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'get_by_hash', params)!
-	assert resp.result.string() == json.encode(blob)
-
-	println('✓ FsBlob handle get_by_hash test passed!')
-}
-
-fn test_fs_blob_handle_exists_by_hash() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Exists By Hash Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.hash)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'exists_by_hash',
-		params)!
-	assert resp.result.string() == 'true'
-
-	println('✓ FsBlob handle exists_by_hash test passed!')
-}
-
-fn test_fs_blob_handle_verify() ! {
-	mut mydb := db.new_test()!
-	mut db_fs_blob := DBFsBlob{
-		db: &mydb
-	}
-
-	mut args := FsBlobArg{
-		data: 'Handle Verify Test'.bytes()
-	}
-	mut blob := db_fs_blob.new(args)!
-	blob = db_fs_blob.set(blob)!
-
-	mut f := FSFactory{
-		fs_blob: db_fs_blob
-	}
-
-	params := json.encode(blob.hash)
-	resp := fs_blob_handle(mut f, 1, map[string]string{}, UserRef{}, 'verify', params)!
-	assert resp.result.string() == 'true'
-
-	println('✓ FsBlob handle verify test passed!')
-}