null+****@clear*****
null+****@clear*****
2012年 8月 2日 (木) 16:39:56 JST
SHIMODA Hiroshi 2012-08-02 16:39:56 +0900 (Thu, 02 Aug 2012) New Revision: 9122b56bfeb8ff3be5116eee9f194a87a0e9f5ce https://github.com/groonga/gcs/commit/9122b56bfeb8ff3be5116eee9f194a87a0e9f5ce Log: Fold long lines Modified files: test/database-domain.test.js test/database-index-field.test.js Modified: test/database-domain.test.js (+9 -5) =================================================================== --- test/database-domain.test.js 2012-08-02 16:35:59 +0900 (9ba6d92) +++ test/database-domain.test.js 2012-08-02 16:39:56 +0900 (7e41200) @@ -67,7 +67,8 @@ suite('database', function() { test('termsTableName', function() { var domain = new Domain('valid123'); domain.id = Domain.DEFAULT_ID; - assert.equal(domain.termsTableName, 'valid123_' + Domain.DEFAULT_ID + '_BigramTerms'); + assert.equal(domain.termsTableName, + 'valid123_' + Domain.DEFAULT_ID + '_BigramTerms'); }); suite('from query parameter', function() { @@ -278,8 +279,9 @@ suite('database', function() { var dump = context.commandSync('dump', { tables: domain.tableName }); - var expectedDump = 'table_create ' + domain.tableName + ' TABLE_HASH_KEY ShortText\n' + - 'table_create ' + domain.termsTableName + ' ' + + var expectedDump = 'table_create ' + domain.tableName + ' ' + + 'TABLE_HASH_KEY ShortText\n' + + 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; assert.equal(dump, expectedDump); @@ -311,8 +313,10 @@ suite('database', function() { assert.isTrue(domain.isSynonymTableAvailableSync()); var dumpExpected = - 'table_create ' + domain.synonymTableName + ' TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' + - 'column_create ' + domain.synonymTableName + ' synonyms COLUMN_VECTOR ShortText\n' + + 'table_create ' + domain.synonymTableName + ' ' + + 'TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' + + 'column_create ' + domain.synonymTableName + ' ' + + 'synonyms COLUMN_VECTOR ShortText\n' + 'load --table ' + domain.synonymTableName + '\n' + '[\n' + '["_key","synonyms"],\n' + Modified: test/database-index-field.test.js (+31 -15) =================================================================== --- test/database-index-field.test.js 2012-08-02 16:35:59 +0900 (e4b0d28) +++ test/database-index-field.test.js 2012-08-02 16:39:56 +0900 (c055ccc) @@ -63,12 +63,14 @@ suite('database', function() { test('indexColumnName', function() { var field = new IndexField('valid_123', domain); - assert.equal(field.indexColumnName, 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); + assert.equal(field.indexColumnName, + 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); }); test('alterTableName', function() { var field = new IndexField('valid_123', domain); - assert.equal(field.alterTableName, 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); + assert.equal(field.alterTableName, + 'testdomain_' + Domain.DEFAULT_ID + '_valid_123'); }); test('fieldTypeToColumnType (text)', function() { @@ -199,7 +201,8 @@ suite('database', function() { }); function getNoColumnDump() { - return 'table_create ' + domain.tableName + ' TABLE_HASH_KEY ShortText\n' + + return 'table_create ' + domain.tableName + ' ' + + 'TABLE_HASH_KEY ShortText\n' + 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; @@ -218,13 +221,17 @@ suite('database', function() { var dump = context.commandSync('dump', { tables: domain.tableName }); - var expected = 'table_create ' + domain.tableName + ' TABLE_HASH_KEY ShortText\n' + - 'column_create ' + domain.tableName + ' ' + field.columnName + ' COLUMN_SCALAR ShortText\n' + + var expected = 'table_create ' + domain.tableName + ' ' + + 'TABLE_HASH_KEY ShortText\n' + + 'column_create ' + domain.tableName + ' ' + + field.columnName + ' COLUMN_SCALAR ShortText\n' + 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'column_create ' + domain.termsTableName + ' ' + field.indexColumnName + ' ' + - 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + ' ' + field.columnName; + 'column_create ' + domain.termsTableName + ' ' + + field.indexColumnName + ' ' + + 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + + ' ' + field.columnName; assert.equal(dump, expected); }); @@ -257,15 +264,19 @@ suite('database', function() { var dump = context.commandSync('dump', { tables: domain.tableName }); - var expected = 'table_create ' + domain.tableName + ' TABLE_HASH_KEY ShortText\n' + - 'column_create ' + domain.tableName + ' ' + field.columnName + ' COLUMN_SCALAR UInt32\n' + + var expected = 'table_create ' + domain.tableName + ' ' + + 'TABLE_HASH_KEY ShortText\n' + + 'column_create ' + domain.tableName + ' ' + + field.columnName + ' COLUMN_SCALAR UInt32\n' + 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + 'table_create ' + field.alterTableName + ' ' + 'TABLE_HASH_KEY UInt32\n' + - 'column_create ' + field.alterTableName + ' ' + field.indexColumnName + ' ' + - 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + ' ' + field.columnName; + 'column_create ' + field.alterTableName + ' ' + + field.indexColumnName + ' ' + + 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + + ' ' + field.columnName; assert.equal(dump, expected); }); @@ -298,15 +309,20 @@ suite('database', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create ' + domain.tableName + ' TABLE_HASH_KEY ShortText\n' + + var expected = 'table_create ' + domain.tableName + ' ' + + 'TABLE_HASH_KEY ShortText\n' + 'table_create ' + domain.termsTableName + ' ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + 'table_create ' + field.alterTableName + ' ' + 'TABLE_HASH_KEY ShortText\n' + - 'column_create ' + field.alterTableName + ' ' + field.indexColumnName + ' ' + - 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + ' ' + field.columnName + '\n' + - 'column_create ' + domain.tableName + ' ' + field.columnName + ' COLUMN_SCALAR ' + field.alterTableName; + 'column_create ' + field.alterTableName + ' ' + + field.indexColumnName + ' ' + + 'COLUMN_INDEX|WITH_POSITION ' + domain.tableName + + ' ' + field.columnName + '\n' + + 'column_create ' + domain.tableName + ' ' + + field.columnName + ' COLUMN_SCALAR ' + + field.alterTableName; assert.equal(dump, expected); }); -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download