Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / test / mocha / Eos.test.js

diff --git a/test/mocha/Eos.test.js b/test/mocha/Eos.test.js
index e189015..764c60d 100755 (executable)
--- a/test/mocha/Eos.test.js
+++ b/test/mocha/Eos.test.js
@@ -20,7 +20,11 @@
     */
     `;
 
+<<<<<<< HEAD
     
+=======
+
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     describe('Eos クラス', function() {
         before(function() {
         });
@@ -78,7 +82,11 @@
 
         var test2 = `
         /**
+<<<<<<< HEAD
         * 実行時文字列への変換 
+=======
+        * 実行時文字列への変換
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         *
         * @param command
         * @param options
@@ -90,13 +98,21 @@
         describe(test2, function() {
             it('should return true when all options is proper.', function() {
                 var result = eos.toExecString('dcdFilePrint', [{name: '-r', arguments: [1,2,3]}, { name: '-i', arguments: ['file1.txt']}, { name: '-o', arguments: ['file3.txt']} ], "1f83f620-c1ed-11e5-9657-7942989daa00");
+<<<<<<< HEAD
                 expect(result).to.equal('dcdFilePrint -r 1 2 3 -s 10 -e 100 -d 10 -m 0 -i /Users/Takafumi/zephyr/server/class/../../user-specific-files/workspace/file1.txt -o /Users/Takafumi/zephyr/server/class/../../user-specific-files/workspace/file3.txt');
+=======
+                expect(result).to.equal('dcdFilePrint -r 1 2 3 -s 10 -e 100 -d 10 -m 0 -i /Users/hiratakengo/zephyr/server/class/../../user-specific-files/workspace/file1.txt -o /Users/hiratakengo/zephyr/server/class/../../user-specific-files/workspace/file3.txt');
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
             });
         });
 
         var toExecArray = `
         /**
+<<<<<<< HEAD
         * 実行時配列への変換 
+=======
+        * 実行時配列への変換
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         *
         * @param command
         * @returns {string}
@@ -121,7 +137,11 @@
             });
 
         });
+<<<<<<< HEAD
         
+=======
+
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         describe('execute', function() {
             before(function() {
                 process.env.NODE_ENV = '';
@@ -175,7 +195,11 @@
         var getUUIDs = `
         /**
         * function getUUIDs(fileId)
+<<<<<<< HEAD
         * uuidとファイル名のkey-valueを取得 
+=======
+        * uuidとファイル名のkey-valueを取得
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         *
         * @param fileId
         * @returns {object} key: filename, value: uuid