Updated tests for better coverage

uport-project · Aug 2, 2017 · 091c0ec · 091c0ec
1 parent 429a355
commit 091c0ec
Show file tree

Hide file tree

Showing 41 changed files with 590 additions and 775 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -1,5 +1,6 @@
 module.exports = {
   port: 8555,
   testCommand: 'sleep 5 && ../node_modules/.bin/truffle test --network coverage',
-  accounts: 25
+  accounts: 25,
+  skipFiles: ['misc/Migrations.sol']
 };
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # uPort Identity Contracts
 [![npm](https://img.shields.io/npm/v/npm.svg)](https://www.npmjs.com/package/uport-identity)
 ![CircleCI](https://img.shields.io/circleci/project/github/uport-project/uport-identity.svg)
-[![solidity-coverage](https://img.shields.io/badge/coverage-91.96%25-green.svg)](https://uport-project.github.io/uport-identity/coverage)
+[![solidity-coverage](https://img.shields.io/badge/coverage-97.42%25-green.svg)](https://uport-project.github.io/uport-identity/coverage)
 
 Please read our [Whitepaper](http://whitepaper.uport.me) for information on what uPort is, and what is currently possible as far as integration.
 

diff --git a/contracts/misc/MetaTestRegistry.sol b/contracts/misc/MetaTestRegistry.sol
@@ -10,10 +10,6 @@ contract MetaTestRegistry {
     registry[sender] = x;
   }
 
-  function reallyLongFunctionName(uint with, address many, string strange, uint params) {
-    registry[many] = params;
-  }
-
   function testThrow(address sender) {
       throw;
   }

diff --git a/docs/coverage/contracts/IdentityFactory.sol.html b/docs/coverage/contracts/IdentityFactory.sol.html
@@ -124,7 +124,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 14:14:06 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 18:09:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/IdentityFactoryWithRecoveryKey.sol.html b/docs/coverage/contracts/IdentityFactoryWithRecoveryKey.sol.html
@@ -127,7 +127,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 14:14:06 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 18:09:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>

diff --git a/docs/coverage/contracts/IdentityManager.sol.html b/docs/coverage/contracts/IdentityManager.sol.html
@@ -20,14 +20,14 @@ <h1>
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">88.1% </span>
+        <span class="strong">100% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>37/42</span>
+        <span class='fraction'>42/42</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">62.5% </span>
+        <span class="strong">93.75% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>10/16</span>
+        <span class='fraction'>15/16</span>
       </div>
       <div class='fl pad1y space-right2'>
         <span class="strong">100% </span>
@@ -276,29 +276,29 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11×</span>
+<span class="cline-any cline-yes">12×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36×</span>
+<span class="cline-any cline-yes">49×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5×</span>
+<span class="cline-any cline-yes">9×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25×</span>
-<span class="cline-any cline-yes">25×</span>
-<span class="cline-any cline-yes">25×</span>
+<span class="cline-any cline-yes">41×</span>
+<span class="cline-any cline-yes">35×</span>
+<span class="cline-any cline-yes">35×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33×</span>
+<span class="cline-any cline-yes">41×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -307,20 +307,20 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8×</span>
-<span class="cline-any cline-yes">8×</span>
-<span class="cline-any cline-yes">8×</span>
+<span class="cline-any cline-yes">9×</span>
+<span class="cline-any cline-yes">9×</span>
+<span class="cline-any cline-yes">9×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24×</span>
+<span class="cline-any cline-yes">29×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24×</span>
-<span class="cline-any cline-yes">24×</span>
+<span class="cline-any cline-yes">29×</span>
+<span class="cline-any cline-yes">29×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -336,26 +336,26 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5×</span>
+<span class="cline-any cline-yes">6×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16×</span>
-<span class="cline-any cline-yes">16×</span>
+<span class="cline-any cline-yes">20×</span>
+<span class="cline-any cline-yes">20×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5×</span>
-<span class="cline-any cline-yes">5×</span>
-<span class="cline-any cline-yes">5×</span>
+<span class="cline-any cline-yes">8×</span>
+<span class="cline-any cline-yes">7×</span>
+<span class="cline-any cline-yes">7×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2×</span>
-<span class="cline-any cline-yes">2×</span>
+<span class="cline-any cline-yes">3×</span>
+<span class="cline-any cline-yes">3×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -364,8 +364,8 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2×</span>
-<span class="cline-any cline-yes">2×</span>
+<span class="cline-any cline-yes">3×</span>
+<span class="cline-any cline-yes">3×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -400,7 +400,7 @@ <h1>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7×</span>
+<span class="cline-any cline-yes">10×</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -468,20 +468,20 @@ <h1>
   }
 &nbsp;
   modifier onlyRecovery(address identity) {
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (recoveryKeys[identity] == msg.sender) _ ;
-    else <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (recoveryKeys[identity] == msg.sender) _ ;
+    else throw;
   }
 &nbsp;
   modifier rateLimited(address identity) {
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (limiter[identity][msg.sender] &lt; (now - adminRate)) {
+    if (limiter[identity][msg.sender] &lt; (now - adminRate)) {
       limiter[identity][msg.sender] = now;
       _ ;
-    } else <span class="cstat-no" title="statement not covered" >throw;</span>
+    } else throw;
   }
 &nbsp;
   modifier validAddress(address addr) { //protects against some weird attacks
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (addr != address(0)) _;
-    else <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (addr != address(0)) _;
+    else throw;
   }
 &nbsp;
   /// @dev Contract constructor sets initial timelock limits
@@ -510,7 +510,7 @@ <h1>
   /// @param recoveryKey Key of recovery network or address from seed to recovery proxy
   /// Note: User must change owner of proxy to this contract after calling this
   function registerIdentity(address owner, address recoveryKey) validAddress(recoveryKey) {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (recoveryKeys[msg.sender] &gt; 0) <span class="cstat-no" title="statement not covered" >throw;</span> // Deny any funny business
+    if (recoveryKeys[msg.sender] &gt; 0) throw; // Deny any funny business
     owners[msg.sender][owner] = now - adminTimeLock; // This is to ensure original owner has full power from day one
     recoveryKeys[msg.sender] = recoveryKey;
     IdentityCreated(msg.sender, msg.sender, owner, recoveryKey);
@@ -529,7 +529,7 @@ <h1>
 &nbsp;
   /// @dev Allows a recoveryKey to add a new owner with userTimeLock waiting time
   function addOwnerFromRecovery(Proxy identity, address newOwner) onlyRecovery(identity) rateLimited(identity) {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (isOwner(identity, newOwner)) <span class="cstat-no" title="statement not covered" >throw;</span>
+    if (isOwner(identity, newOwner)) throw;
     owners[identity][newOwner] = now;
     OwnerAdded(identity, newOwner, msg.sender);
   }
@@ -595,7 +595,7 @@ <h1>
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 14:14:06 GMT+0200 (CEST)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Wed Aug 02 2017 18:09:16 GMT+0200 (CEST)
 </div>
 </div>
 <script src="../prettify.js"></script>