windows tweaks to unicode tests again

mapbox · Jan 17, 2013 · 09dfe46 · 09dfe46
1 parent 912b9af
commit 09dfe46
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/test/data/Clément/Olá.txt → test/data/Clément/Olá.txt b/test/data/Clément/Olá.txt → test/data/Clément/Olá.txt
diff --git a/test/data/Clément/Olá.txt.zip → test/data/Clément/Olá.zip b/test/data/Clément/Olá.txt.zip → test/data/Clément/Olá.zip
diff --git a/test/data/Clément/foo.csv → test/data/Clément/foo.csv b/test/data/Clément/foo.csv → test/data/Clément/foo.csv
diff --git a/test/data/Clément/foo.csv.zip → test/data/Clément/foo.csv.zip b/test/data/Clément/foo.csv.zip → test/data/Clément/foo.csv.zip
diff --git a/test/data/ééé/foo.csv b/test/data/ééé/foo.csv
@@ -0,0 +1,2 @@
+x,y
+0,0
diff --git a/test/data/ééé/foo.csv.zip b/test/data/ééé/foo.csv.zip
diff --git a/test/unicode.test.js b/test/unicode.test.js
@@ -11,18 +11,18 @@ describe('Handling unicode paths, filenames, and data', function(){
         var zf = new zipfile.ZipFile(zippath);
         assert.equal(zf.count, 3);
         var buffer = zf.readFileSync(zf.names[0]);
-        assert.equal(buffer.toString('utf8'),fs.readFileSync(zippath.replace('.zip','')).toString('utf8'));
+        assert.equal(buffer.toString('utf8'),fs.readFileSync(zippath.replace('.zip','')).toString('utf8').replace(/\r/g,''));
     });
 
     it('open zip with folder and file with unicode', function(){
-        var zippath = './test/data/Clément/Olá.txt.zip';
+        var zippath = './test/data/Clément/Olá.zip';
         assert.ok(existsSync(zippath));
         var zf = new zipfile.ZipFile(zippath);
         assert.equal(zf.count, 1);
     });
 
     it('open zip with unicode paths and unicode filenames in archive', function(){
-        var zippath = './test/data/Clément/Olá.txt.zip';
+        var zippath = './test/data/Clément/Olá.zip';
         assert.ok(existsSync(zippath));
         var zf = new zipfile.ZipFile(zippath);
         assert.equal(zf.count, 1);
@@ -41,7 +41,7 @@ describe('Handling unicode paths, filenames, and data', function(){
         assert.equal(zf.count, 3);
         assert.deepEqual(zf.names, ["你好_points.csv","__MACOSX/","__MACOSX/._你好_points.csv"]);
         var buffer = zf.readFileSync(zf.names[0]);
-        assert.equal(buffer.toString('utf8'),fs.readFileSync('./test/data/你好_points.csv').toString('utf8'));
+        assert.equal(buffer.toString('utf8'),fs.readFileSync('./test/data/你好_points.csv').toString('utf8').replace(/\r/g,''));
     });
 
 });