add force

Author: liangchaoboy

test/rs.test.js

@@ -15,6 +15,10 @@ var logo2 = Math.random() + 'logo2.png';
 var logo3 = Math.random() + 'logo3.png';
 var logo4 = Math.random() + 'logo4.png';
 var logo5 = Math.random() + 'logo5.png';
+var logo6 = Math.random() + 'logo6.png';
+var logo7 = Math.random() + 'logo7.png';
+
+
 
 describe('test start step2:', function() {
 
@@ -32,13 +36,25 @@ describe('test start step2:', function() {
           TEST_BUCKET
         );
         var uptoken = putPolicy.token();
+        qiniu.io.putFile(uptoken, logo, imageFile, null, function(err, ret) {
+          should.not.exist(err);
+        });
+
+        qiniu.io.putFile(uptoken, logo1, imageFile, null, function(err, ret) {
+          should.not.exist(err);
+          done();
+        });
+
         qiniu.io.putFile(uptoken, logo2, imageFile, null, function(err, ret) {
           should.not.exist(err);
+          done();
         });
-        qiniu.io.putFile(uptoken, logo, imageFile, null, function(err, ret) {
+
+        qiniu.io.putFile(uptoken, logo3, imageFile, null, function(err, ret) {
           should.not.exist(err);
           done();
         });
+
       });
 
       describe('rs.Client#stat()', function() {
@@ -52,8 +68,8 @@ describe('test start step2:', function() {
       });
 
       describe('rs.Client#copy()', function() {
-        it('copy logo.png to logo1.png', function(done) {
-          client.copy(TEST_BUCKET, logo, TEST_BUCKET, logo1, function(err, ret) {
+        it('copy logo.png to logo5.png', function(done) {
+          client.copy(TEST_BUCKET, logo, TEST_BUCKET, logo5, function(err, ret) {
             should.not.exist(err);
             done();
           });
@@ -71,26 +87,26 @@ describe('test start step2:', function() {
 
 
       describe('rs.Client#remove()', function() {
-        it('remove logo.png', function(done) {
-          client.remove(TEST_BUCKET, logo, function(err, ret) {
+        it('remove logo5.png', function(done) {
+          client.remove(TEST_BUCKET, logo5, function(err, ret) {
             should.not.exist(err);
             done();
           });
         });
       });
 
       describe('rs.Client#move()', function() {
-        it('move logo.png to logo3.png', function(done) {
-          client.move(TEST_BUCKET, logo, TEST_BUCKET, logo3, function(err, ret) {
+        it('move logo.png to logo5.png', function(done) {
+          client.move(TEST_BUCKET, logo, TEST_BUCKET, logo5, function(err, ret) {
             should.not.exist(err);
             done();
           });
         });
       });
 
       describe('rs.Client#forceMove()', function() {
-        it('move logo3.png to logo.png', function(done) {
-          client.forceMove(TEST_BUCKET, logo3, TEST_BUCKET, logo, 1, function(err, ret) {
+        it('move logo5.png to logo.png', function(done) {
+          client.forceMove(TEST_BUCKET, logo5, TEST_BUCKET, logo, 1, function(err, ret) {
             should.not.exist(err);
             done();
           });
@@ -151,10 +167,10 @@ describe('test start step2:', function() {
 
       describe('rs.Client#batchCopy', function() {
         var entries = [];
-        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo), new EntryPath(TEST_BUCKET, logo1)));
-        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo2), new EntryPath(TEST_BUCKET, logo3)));
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo), new EntryPath(TEST_BUCKET, logo6)));
+        entries.push(new EntryPathPair(new EntryPath(TEST_BUCKET, logo2), new EntryPath(TEST_BUCKET, logo7)));
 
-        it('copy from logo, logo2 to logo1, logo3', function(done) {
+        it('copy from logo, logo2 to logo6, logo7', function(done) {
           client.batchCopy(entries, function(err, ret) {
             should.not.exist(err);
             ret.should.eql([ { code: 200 }, { code: 200 } ]);