Bläddra i källkod

fix testing error throwing

Jakub Wojciechowski 8 år sedan
förälder
incheckning
5e7847537a
4 ändrade filer med 44 tillägg och 36 borttagningar
  1. 4 2
      test/Claimable.js
  2. 30 26
      test/DayLimit.js
  3. 2 1
      test/Ownable.js
  4. 8 7
      test/Pausable.js

+ 4 - 2
test/Claimable.js

@@ -27,8 +27,9 @@ contract('Claimable', function(accounts) {
     try {
         await claimable.claimOwnership({from: accounts[2]});
     } catch(error) {
-        assertJump(error);
+        return assertJump(error);
     }
+    assert.fail('should have thrown before');
   });
 
   it('should prevent non-owners from transfering', async function() {
@@ -38,8 +39,9 @@ contract('Claimable', function(accounts) {
     try {
         await claimable.transferOwnership(other, {from: other});
     } catch(error) {
-        assertJump(error);
+        return assertJump(error);
     }
+    assert.fail('should have thrown before');
   });
 
   describe('after initiating a transfer', function () {

+ 30 - 26
test/DayLimit.js

@@ -37,8 +37,9 @@ contract('DayLimit', function(accounts) {
     try {
         await dayLimit.attemptSpend(3);
     } catch(error) {
-        assertJump(error);
+        return assertJump(error);
     }
+    assert.fail('should have thrown before');
   });
 
   it('should allow spending if daily limit is reached and then set higher', async function() {
@@ -47,17 +48,18 @@ contract('DayLimit', function(accounts) {
     assert.equal(spentToday, 8);
 
     try {
-        await dayLimit.attemptSpend(3);
+      await dayLimit.attemptSpend(3);
     } catch(error) {
-        assertJump(error);
-    }
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 8);
+      assertJump(error);
+      spentToday = await dayLimit.spentToday();
+      assert.equal(spentToday, 8);
 
-    await dayLimit.setDailyLimit(15);
-    await dayLimit.attemptSpend(3);
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 11);
+      await dayLimit.setDailyLimit(15);
+      await dayLimit.attemptSpend(3);
+      spentToday = await dayLimit.spentToday();
+      return assert.equal(spentToday, 11);
+    }
+    assert.fail('should have thrown before');
   });
 
   it('should allow spending if daily limit is reached and then amount spent is reset', async function() {
@@ -66,17 +68,18 @@ contract('DayLimit', function(accounts) {
     assert.equal(spentToday, 8);
 
     try {
-        await dayLimit.attemptSpend(3);
+      await dayLimit.attemptSpend(3);
     } catch(error) {
-        assertJump(error);
-    }
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 8);
+      assertJump(error);
+      spentToday = await dayLimit.spentToday();
+      assert.equal(spentToday, 8);
 
-    await dayLimit.resetSpentToday(15);
-    await dayLimit.attemptSpend(3);
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 3);
+      await dayLimit.resetSpentToday(15);
+      await dayLimit.attemptSpend(3);
+      spentToday = await dayLimit.spentToday();
+      return assert.equal(spentToday, 3);
+    }
+    assert.fail('should have thrown before');
   });
 
   it('should allow spending if daily limit is reached and then the next has come', async function() {
@@ -91,15 +94,16 @@ contract('DayLimit', function(accounts) {
       await dayLimit.attemptSpend(3);
     } catch(error) {
       assertJump(error);
-    }
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 8);
+      spentToday = await dayLimit.spentToday();
+      assert.equal(spentToday, 8);
 
-    await timer(day);
+      await timer(day);
 
-    await dayLimit.attemptSpend(3);
-    spentToday = await dayLimit.spentToday();
-    assert.equal(spentToday, 3);
+      await dayLimit.attemptSpend(3);
+      spentToday = await dayLimit.spentToday();
+      return assert.equal(spentToday, 3);
+    }
+    assert.fail('should have thrown before');
   });
 
 });

+ 2 - 1
test/Ownable.js

@@ -30,8 +30,9 @@ contract('Ownable', function(accounts) {
     try {
       await ownable.transferOwnership(other, {from: other});
     } catch(error) {
-      assertJump(error);
+      return assertJump(error);
     }
+    assert.fail('should have thrown before');
   });
 
   it('should guard ownership against stuck state', async function() {

+ 8 - 7
test/Pausable.js

@@ -24,10 +24,11 @@ contract('Pausable', function(accounts) {
     try {
       await Pausable.normalProcess();
     } catch(error) {
-      assertJump(error);
+      let count1 = await Pausable.count();
+      assert.equal(count1, 0);
+      return assertJump(error);
     }
-    let count1 = await Pausable.count();
-    assert.equal(count1, 0);
+    assert.fail('should have thrown before');
   });
 
 
@@ -36,11 +37,11 @@ contract('Pausable', function(accounts) {
     try {
       await Pausable.drasticMeasure();
     } catch(error) {
-      assertJump(error);
+      const drasticMeasureTaken = await Pausable.drasticMeasureTaken();
+      assert.isFalse(drasticMeasureTaken);
+      return assertJump(error);
     }
-
-    const drasticMeasureTaken = await Pausable.drasticMeasureTaken();
-    assert.isFalse(drasticMeasureTaken);
+    assert.fail('should have thrown before');
   });
 
   it('can take a drastic measure in a pause', async function() {