YUKI Hiroshi
null+****@clear*****
Tue Dec 2 12:33:42 JST 2014
YUKI Hiroshi 2014-12-02 12:33:42 +0900 (Tue, 02 Dec 2014) New Revision: 5eb778838403a07a34448095d3c7efde7ed73089 https://github.com/droonga/droonga-engine/commit/5eb778838403a07a34448095d3c7efde7ed73089 Message: Add more tests for add/delete with mismatched type key Added files: test/command/fixture/integer-key-table.jsons test/command/fixture/string-key-table.jsons test/command/suite/add/key-string.test test/command/suite/add/mismatched-key-type/acceptable/integer-for-string.test test/command/suite/add/mismatched-key-type/acceptable/string-for-integer.test test/command/suite/groonga/delete/mismatched-type-key/acceptable/string-for-integer.test Copied files: test/command/suite/add/key-integer.expected (from test/command/suite/add/integer-key-by-string.expected) test/command/suite/add/key-integer.test (from test/command/suite/add/minimum.test) test/command/suite/add/mismatched-key-type/acceptable/string-for-integer.expected (from test/command/suite/add/integer-key-by-string.expected) Removed files: test/command/fixture/integer-key-user-table.jsons test/command/suite/add/integer-key-by-string.test test/command/suite/add/string-key-by-integer.test test/command/suite/groonga/delete/key-integer-by-string.test Modified files: test/command/suite/groonga/delete/key-integer.test test/command/suite/groonga/delete/key-string.test Renamed files: test/command/suite/add/key-string.expected (from test/command/suite/add/minimum.expected) test/command/suite/add/mismatched-key-type/acceptable/integer-for-string.expected (from test/command/suite/add/string-key-by-integer.expected) test/command/suite/add/without-values.expected (from test/command/suite/add/integer-key-by-string.expected) test/command/suite/add/without-values.test (from test/command/suite/add/minimum.test) test/command/suite/groonga/delete/mismatched-type-key/acceptable/integer-for-string.expected (from test/command/suite/groonga/delete/key-integer-by-string.expected) test/command/suite/groonga/delete/mismatched-type-key/acceptable/integer-for-string.test (from test/command/suite/groonga/delete/key-string-by-integer.test) test/command/suite/groonga/delete/mismatched-type-key/acceptable/string-for-integer.expected (from test/command/suite/groonga/delete/key-string-by-integer.expected) Added: test/command/fixture/integer-key-table.jsons (+11 -0) 100644 =================================================================== --- /dev/null +++ test/command/fixture/integer-key-table.jsons 2014-12-02 12:33:42 +0900 (ed7831b) @@ -0,0 +1,11 @@ +#@disable-logging +{ + "type": "table_create", + "dataset": "Default", + "body": { + "name" : "Integer", + "flags" : "TABLE_PAT_KEY", + "key_type" : "UInt32" + } +} +#@enable-logging Deleted: test/command/fixture/integer-key-user-table.jsons (+0 -48) 100644 =================================================================== --- test/command/fixture/integer-key-user-table.jsons 2014-12-02 12:14:55 +0900 (cfb4c03) +++ /dev/null @@ -1,48 +0,0 @@ -#@disable-logging -{ - "type": "table_create", - "dataset": "Default", - "body": { - "name" : "User", - "flags" : "TABLE_PAT_KEY", - "key_type" : "UInt32" - } -} -{ - "type": "column_create", - "dataset": "Default", - "body": { - "table" : "User", - "name" : "name", - "type" : "ShortText" - } -} -{ - "type": "column_create", - "dataset": "Default", - "body": { - "table" : "User", - "name" : "age", - "type" : "Int32" - } -} -{ - "type": "column_create", - "dataset": "Default", - "body": { - "table" : "User", - "name" : "email", - "type" : "ShortText", - "flags" : "COLUMN_VECTOR" - } -} -{ - "type": "column_create", - "dataset": "Default", - "body": { - "table" : "User", - "name" : "birthday", - "type" : "Time" - } -} -#@enable-logging Added: test/command/fixture/string-key-table.jsons (+11 -0) 100644 =================================================================== --- /dev/null +++ test/command/fixture/string-key-table.jsons 2014-12-02 12:33:42 +0900 (9194ac3) @@ -0,0 +1,11 @@ +#@disable-logging +{ + "type": "table_create", + "dataset": "Default", + "body": { + "name" : "String", + "flags" : "TABLE_PAT_KEY", + "key_type" : "ShortText" + } +} +#@enable-logging Deleted: test/command/suite/add/integer-key-by-string.test (+0 -11) 100644 =================================================================== --- test/command/suite/add/integer-key-by-string.test 2014-12-02 12:14:55 +0900 (9b03df1) +++ /dev/null @@ -1,11 +0,0 @@ -#@include fixture/integer-key-user-table.jsons -{ - "type": "add", - "dataset": "Default", - "body": { - "table": "User", - "key": "1", - "values": { - } - } -} Copied: test/command/suite/add/key-integer.expected (+0 -0) 100% =================================================================== Copied: test/command/suite/add/key-integer.test (+0 -0) 100% =================================================================== Renamed: test/command/suite/add/key-string.expected (+0 -0) 100% =================================================================== Added: test/command/suite/add/key-string.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/add/key-string.test 2014-12-02 12:33:42 +0900 (8d7038d) @@ -0,0 +1,9 @@ +#@include fixture/string-key-table.jsons +{ + "type": "add", + "dataset": "Default", + "body": { + "table": "String", + "key": "key" + } +} Renamed: test/command/suite/add/mismatched-key-type/acceptable/integer-for-string.expected (+0 -0) 100% =================================================================== Added: test/command/suite/add/mismatched-key-type/acceptable/integer-for-string.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/add/mismatched-key-type/acceptable/integer-for-string.test 2014-12-02 12:33:42 +0900 (91fec10) @@ -0,0 +1,9 @@ +#@include fixture/string-key-table.jsons +{ + "type": "add", + "dataset": "Default", + "body": { + "table": "String", + "key": 1 + } +} Copied: test/command/suite/add/mismatched-key-type/acceptable/string-for-integer.expected (+0 -0) 100% =================================================================== Added: test/command/suite/add/mismatched-key-type/acceptable/string-for-integer.test (+9 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/add/mismatched-key-type/acceptable/string-for-integer.test 2014-12-02 12:33:42 +0900 (ba9a961) @@ -0,0 +1,9 @@ +#@include fixture/integer-key-table.jsons +{ + "type": "add", + "dataset": "Default", + "body": { + "table": "Integer", + "key": "1" + } +} Deleted: test/command/suite/add/string-key-by-integer.test (+0 -11) 100644 =================================================================== --- test/command/suite/add/string-key-by-integer.test 2014-12-02 12:14:55 +0900 (8527064) +++ /dev/null @@ -1,11 +0,0 @@ -#@include fixture/user-table.jsons -{ - "type": "add", - "dataset": "Default", - "body": { - "table": "User", - "key": 1, - "values": { - } - } -} Renamed: test/command/suite/add/without-values.expected (+0 -0) 100% =================================================================== Renamed: test/command/suite/add/without-values.test (+0 -0) 100% =================================================================== Deleted: test/command/suite/groonga/delete/key-integer-by-string.test (+0 -20) 100644 =================================================================== --- test/command/suite/groonga/delete/key-integer-by-string.test 2014-12-02 12:14:55 +0900 (3c757c2) +++ /dev/null @@ -1,20 +0,0 @@ -#@include fixture/integer-key-user-table.jsons -{ - "type": "add", - "dataset": "Default", - "body": { - "table" : "User", - "key" : 1, - "values" : { - "name": "1" - } - } -} -{ - "type": "delete", - "dataset": "Default", - "body": { - "table" : "User", - "key" : "1" - } -} Modified: test/command/suite/groonga/delete/key-integer.test (+4 -7) =================================================================== --- test/command/suite/groonga/delete/key-integer.test 2014-12-02 12:14:55 +0900 (395b504) +++ test/command/suite/groonga/delete/key-integer.test 2014-12-02 12:33:42 +0900 (74bb6ad) @@ -1,20 +1,17 @@ -#@include fixture/integer-key-user-table.jsons +#@include fixture/integer-key-table.jsons { "type": "add", "dataset": "Default", "body": { - "table" : "User", - "key" : 1, - "values" : { - "name": "1" - } + "table" : "Integer", + "key" : 1 } } { "type": "delete", "dataset": "Default", "body": { - "table" : "User", + "table" : "Integer", "key" : 1 } } Modified: test/command/suite/groonga/delete/key-string.test (+4 -6) =================================================================== --- test/command/suite/groonga/delete/key-string.test 2014-12-02 12:14:55 +0900 (45a9019) +++ test/command/suite/groonga/delete/key-string.test 2014-12-02 12:33:42 +0900 (77e6c0c) @@ -1,19 +1,17 @@ -#@include fixture/user-table.jsons +#@include fixture/string-key-table.jsons { "type": "add", "dataset": "Default", "body": { - "table" : "User", - "key" : "key", - "values" : { - } + "table" : "String", + "key" : "key" } } { "type": "delete", "dataset": "Default", "body": { - "table" : "User", + "table" : "String", "key" : "key" } } Renamed: test/command/suite/groonga/delete/mismatched-type-key/acceptable/integer-for-string.expected (+0 -0) 100% =================================================================== Renamed: test/command/suite/groonga/delete/mismatched-type-key/acceptable/integer-for-string.test (+4 -6) 53% =================================================================== --- test/command/suite/groonga/delete/key-string-by-integer.test 2014-12-02 12:14:55 +0900 (8d03d55) +++ test/command/suite/groonga/delete/mismatched-type-key/acceptable/integer-for-string.test 2014-12-02 12:33:42 +0900 (ef1d9a6) @@ -1,19 +1,17 @@ -#@include fixture/user-table.jsons +#@include fixture/string-key-table.jsons { "type": "add", "dataset": "Default", "body": { - "table" : "User", - "key" : "1", - "values" : { - } + "table" : "String", + "key" : "1" } } { "type": "delete", "dataset": "Default", "body": { - "table" : "User", + "table" : "String", "key" : 1 } } Renamed: test/command/suite/groonga/delete/mismatched-type-key/acceptable/string-for-integer.expected (+0 -0) 100% =================================================================== Added: test/command/suite/groonga/delete/mismatched-type-key/acceptable/string-for-integer.test (+17 -0) 100644 =================================================================== --- /dev/null +++ test/command/suite/groonga/delete/mismatched-type-key/acceptable/string-for-integer.test 2014-12-02 12:33:42 +0900 (34c8f25) @@ -0,0 +1,17 @@ +#@include fixture/integer-key-table.jsons +{ + "type": "add", + "dataset": "Default", + "body": { + "table" : "Integer", + "key" : 1 + } +} +{ + "type": "delete", + "dataset": "Default", + "body": { + "table" : "Integer", + "key" : "1" + } +} -------------- next part -------------- HTML����������������������������...Download