Navigation Menu

Skip to content

Commit

Permalink
Fold long lines
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 2, 2012
1 parent d27b19f commit 9122b56
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 20 deletions.
14 changes: 9 additions & 5 deletions test/database-domain.test.js
Expand Up @@ -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() {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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' +
Expand Down
46 changes: 31 additions & 15 deletions test/database-index-field.test.js
Expand Up @@ -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() {
Expand Down Expand Up @@ -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';
Expand All @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down

0 comments on commit 9122b56

Please sign in to comment.