Navigation Menu

Skip to content

Commit

Permalink
Fix tests around translator
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 2, 2012
1 parent 1cda1e7 commit 11c40b3
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lib/batch/processor.js
Expand Up @@ -17,7 +17,7 @@ Processor.prototype = {
if (!this.context && !this.databasePath)
throw new Error('no database path');
this.context = new nroonga.Context(this.context || this.databasePath);
this.translator = new translator.Translator(this.domain);
this.translator = new translator.Translator(this.domain, this.context);
},
validate: function(batches) {
var fields = this.domain.indexFields;
Expand Down
4 changes: 2 additions & 2 deletions lib/batch/translator.js
@@ -1,7 +1,7 @@
var Domain = require('../database').Domain;

function Translator(domain) {
this.domain = new Domain(domain);
function Translator(domain, context) {
this.domain = new Domain(domain, context);
this.initialize();
}

Expand Down
34 changes: 17 additions & 17 deletions test/batch-translator.test.js
Expand Up @@ -25,7 +25,7 @@ suite('batch/translator/Translator (instance methods)', function() {
var expected = {
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batch['id'],
'name': batch['fields']['name'],
Expand All @@ -45,7 +45,7 @@ suite('batch/translator/Translator (instance methods)', function() {
var expected = {
command: 'delete',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
key: batch['id']
}
};
Expand All @@ -58,7 +58,7 @@ suite('batch/translator/Translator (instance methods)', function() {
var expected = {
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batch['id'],
'name': batch['fields']['name'],
Expand All @@ -78,7 +78,7 @@ suite('batch/translator/Translator (instance methods)', function() {
var expected = {
command: 'delete',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
key: batch['id']
}
};
Expand All @@ -92,7 +92,7 @@ suite('batch/translator/Translator (instance methods)', function() {
{
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batches[0]['id'],
'name': batches[0]['fields']['name'],
Expand All @@ -106,7 +106,7 @@ suite('batch/translator/Translator (instance methods)', function() {
{
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batches[1]['id'],
'name': batches[1]['fields']['name'],
Expand All @@ -120,7 +120,7 @@ suite('batch/translator/Translator (instance methods)', function() {
{
command: 'delete',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
key: batches[2]['id']
}
}
Expand All @@ -138,7 +138,7 @@ suite('batch/translator/Translator (class methods)', function() {
var command = {
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batch['id'],
'name': batch['fields']['name'],
Expand All @@ -147,7 +147,7 @@ suite('batch/translator/Translator (class methods)', function() {
}])
}
};
var expected = 'load --table test_00000000000000000000000000 --values ' + command.options.values;
var expected = 'load --table ' + translator.domain.tableName + ' --values ' + command.options.values;
var stringified = Translator.commandToString(command);
assert.equal(stringified, expected);
});
Expand All @@ -158,11 +158,11 @@ suite('batch/translator/Translator (class methods)', function() {
var command = {
command: 'delete',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
key: batch['id']
}
};
var expected = 'delete --table test_00000000000000000000000000 --key ' + command.options.key;
var expected = 'delete --table ' + translator.domain.tableName + ' --key ' + command.options.key;
var stringified = Translator.commandToString(command);
assert.equal(stringified, expected);
});
Expand All @@ -175,7 +175,7 @@ suite('batch/translator/Translator (class methods)', function() {
{
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batches[0]['id'],
'name': batches[0]['fields']['name'],
Expand All @@ -187,7 +187,7 @@ suite('batch/translator/Translator (class methods)', function() {
{
command: 'load',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
values: JSON.stringify([{
'_key': batches[1]['id'],
'name': batches[1]['fields']['name'],
Expand All @@ -199,15 +199,15 @@ suite('batch/translator/Translator (class methods)', function() {
{
command: 'delete',
options: {
table: 'test_00000000000000000000000000',
table: translator.domain.tableName,
key: batches[2]['id']
}
}
];
var expected = [
'load --table test_00000000000000000000000000 --values ' + commands[0].options.values,
'load --table test_00000000000000000000000000 --values ' + commands[1].options.values,
'delete --table test_00000000000000000000000000 --key ' + commands[2].options.key
'load --table ' + translator.domain.tableName + ' --values ' + commands[0].options.values,
'load --table ' + translator.domain.tableName + ' --values ' + commands[1].options.values,
'delete --table ' + translator.domain.tableName + ' --key ' + commands[2].options.key
].join('\n');
var stringified = Translator.commandsToString(commands);
assert.equal(stringified, expected);
Expand Down

0 comments on commit 11c40b3

Please sign in to comment.