From 33a926f3594491f421d4e25be6dd808f5d22ff56 Mon Sep 17 00:00:00 2001
From: Jorgen <Jorgen@LAPTOP-CK3892L1>
Date: Mon, 24 Sep 2018 15:46:39 +0200
Subject: [PATCH] Fiksa spaghetti
---
coverage/calculator.js.html | 2 +-
coverage/coverage-final.json | 4 +--
coverage/dao.js.html | 52 ++++++++++++++++----------------
coverage/index.html | 58 ++++++++++++++++++------------------
coverage/persondao.js.html | 4 +--
coverage/runsqlfile.js.html | 50 +++++++++++++++----------------
coverage/sum.js.html | 2 +-
dao/persondao.js | 2 +-
dao/persondao.test.js | 12 ++++----
server.js | 2 ++
10 files changed, 95 insertions(+), 93 deletions(-)
diff --git a/coverage/calculator.js.html b/coverage/calculator.js.html
index 1f42f4c..d00f370 100644
--- a/coverage/calculator.js.html
+++ b/coverage/calculator.js.html
@@ -157,7 +157,7 @@
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
index ca466ae..774a3ba 100644
--- a/coverage/coverage-final.json
+++ b/coverage/coverage-final.json
@@ -1,6 +1,6 @@
{"C:\\Git\\DatabaseTest\\dao\\calculator.js": {"path":"C:\\Git\\DatabaseTest\\dao\\calculator.js","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":36,"column":2}},"1":{"start":{"line":5,"column":14},"end":{"line":5,"column":37}},"2":{"start":{"line":6,"column":4},"end":{"line":33,"column":5}},"3":{"start":{"line":7,"column":6},"end":{"line":10,"column":8}},"4":{"start":{"line":12,"column":6},"end":{"line":12,"column":36}},"5":{"start":{"line":13,"column":6},"end":{"line":32,"column":7}},"6":{"start":{"line":14,"column":8},"end":{"line":17,"column":10}},"7":{"start":{"line":20,"column":8},"end":{"line":20,"column":52}},"8":{"start":{"line":21,"column":8},"end":{"line":23,"column":9}},"9":{"start":{"line":22,"column":10},"end":{"line":22,"column":19}},"10":{"start":{"line":25,"column":18},"end":{"line":25,"column":36}},"11":{"start":{"line":26,"column":8},"end":{"line":31,"column":9}},"12":{"start":{"line":27,"column":10},"end":{"line":27,"column":64}},"13":{"start":{"line":28,"column":10},"end":{"line":28,"column":68}},"14":{"start":{"line":30,"column":10},"end":{"line":30,"column":21}},"15":{"start":{"line":34,"column":4},"end":{"line":34,"column":13}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},"loc":{"start":{"line":2,"column":16},"end":{"line":2,"column":18}},"line":2},"1":{"name":"(anonymous_1)","decl":{"start":{"line":4,"column":2},"end":{"line":4,"column":3}},"loc":{"start":{"line":4,"column":24},"end":{"line":35,"column":3}},"line":4}},"branchMap":{"0":{"loc":{"start":{"line":6,"column":4},"end":{"line":33,"column":5}},"type":"if","locations":[{"start":{"line":6,"column":4},"end":{"line":33,"column":5}},{"start":{"line":6,"column":4},"end":{"line":33,"column":5}}],"line":6},"1":{"loc":{"start":{"line":13,"column":6},"end":{"line":32,"column":7}},"type":"if","locations":[{"start":{"line":13,"column":6},"end":{"line":32,"column":7}},{"start":{"line":13,"column":6},"end":{"line":32,"column":7}}],"line":13},"2":{"loc":{"start":{"line":21,"column":8},"end":{"line":23,"column":9}},"type":"if","locations":[{"start":{"line":21,"column":8},"end":{"line":23,"column":9}},{"start":{"line":21,"column":8},"end":{"line":23,"column":9}}],"line":21},"3":{"loc":{"start":{"line":26,"column":8},"end":{"line":31,"column":9}},"type":"if","locations":[{"start":{"line":26,"column":8},"end":{"line":31,"column":9}},{"start":{"line":26,"column":8},"end":{"line":31,"column":9}}],"line":26}},"s":{"0":1,"1":22,"2":22,"3":5,"4":17,"5":17,"6":1,"7":16,"8":16,"9":1,"10":15,"11":15,"12":5,"13":5,"14":10,"15":0},"f":{"0":1,"1":22},"b":{"0":[5,17],"1":[1,16],"2":[1,15],"3":[5,10]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"e3c98f051e60a0aec0793a7163d476d79d16e405"}
-,"C:\\Git\\DatabaseTest\\dao\\dao.js": {"path":"C:\\Git\\DatabaseTest\\dao\\dao.js","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":28,"column":2}},"1":{"start":{"line":4,"column":4},"end":{"line":4,"column":21}},"2":{"start":{"line":8,"column":4},"end":{"line":26,"column":7}},"3":{"start":{"line":9,"column":6},"end":{"line":9,"column":48}},"4":{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},"5":{"start":{"line":11,"column":8},"end":{"line":11,"column":45}},"6":{"start":{"line":12,"column":8},"end":{"line":12,"column":60}},"7":{"start":{"line":14,"column":8},"end":{"line":14,"column":48}},"8":{"start":{"line":15,"column":8},"end":{"line":24,"column":11}},"9":{"start":{"line":16,"column":10},"end":{"line":16,"column":31}},"10":{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},"11":{"start":{"line":18,"column":12},"end":{"line":18,"column":29}},"12":{"start":{"line":19,"column":12},"end":{"line":19,"column":55}},"13":{"start":{"line":21,"column":12},"end":{"line":21,"column":47}},"14":{"start":{"line":22,"column":12},"end":{"line":22,"column":32}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},"loc":{"start":{"line":2,"column":20},"end":{"line":5,"column":3}},"line":2},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":2},"end":{"line":7,"column":3}},"loc":{"start":{"line":7,"column":31},"end":{"line":27,"column":3}},"line":7},"2":{"name":"(anonymous_2)","decl":{"start":{"line":8,"column":28},"end":{"line":8,"column":29}},"loc":{"start":{"line":8,"column":49},"end":{"line":26,"column":5}},"line":8},"3":{"name":"(anonymous_3)","decl":{"start":{"line":15,"column":38},"end":{"line":15,"column":39}},"loc":{"start":{"line":15,"column":53},"end":{"line":24,"column":9}},"line":15}},"branchMap":{"0":{"loc":{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},"type":"if","locations":[{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},{"start":{"line":10,"column":6},"end":{"line":25,"column":7}}],"line":10},"1":{"loc":{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},"type":"if","locations":[{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},{"start":{"line":17,"column":10},"end":{"line":23,"column":11}}],"line":17}},"s":{"0":1,"1":1,"2":5,"3":5,"4":5,"5":5,"6":5,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0},"f":{"0":1,"1":5,"2":5,"3":0},"b":{"0":[5,0],"1":[0,0]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"f724344b4cbfd0e4a1378aa30d8c8cbfff483af5"}
+,"C:\\Git\\DatabaseTest\\dao\\dao.js": {"path":"C:\\Git\\DatabaseTest\\dao\\dao.js","statementMap":{"0":{"start":{"line":1,"column":0},"end":{"line":28,"column":2}},"1":{"start":{"line":4,"column":4},"end":{"line":4,"column":21}},"2":{"start":{"line":8,"column":4},"end":{"line":26,"column":7}},"3":{"start":{"line":9,"column":6},"end":{"line":9,"column":48}},"4":{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},"5":{"start":{"line":11,"column":8},"end":{"line":11,"column":45}},"6":{"start":{"line":12,"column":8},"end":{"line":12,"column":60}},"7":{"start":{"line":14,"column":8},"end":{"line":14,"column":48}},"8":{"start":{"line":15,"column":8},"end":{"line":24,"column":11}},"9":{"start":{"line":16,"column":10},"end":{"line":16,"column":31}},"10":{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},"11":{"start":{"line":18,"column":12},"end":{"line":18,"column":29}},"12":{"start":{"line":19,"column":12},"end":{"line":19,"column":55}},"13":{"start":{"line":21,"column":12},"end":{"line":21,"column":47}},"14":{"start":{"line":22,"column":12},"end":{"line":22,"column":32}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":2,"column":2},"end":{"line":2,"column":3}},"loc":{"start":{"line":2,"column":20},"end":{"line":5,"column":3}},"line":2},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":2},"end":{"line":7,"column":3}},"loc":{"start":{"line":7,"column":31},"end":{"line":27,"column":3}},"line":7},"2":{"name":"(anonymous_2)","decl":{"start":{"line":8,"column":28},"end":{"line":8,"column":29}},"loc":{"start":{"line":8,"column":49},"end":{"line":26,"column":5}},"line":8},"3":{"name":"(anonymous_3)","decl":{"start":{"line":15,"column":38},"end":{"line":15,"column":39}},"loc":{"start":{"line":15,"column":53},"end":{"line":24,"column":9}},"line":15}},"branchMap":{"0":{"loc":{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},"type":"if","locations":[{"start":{"line":10,"column":6},"end":{"line":25,"column":7}},{"start":{"line":10,"column":6},"end":{"line":25,"column":7}}],"line":10},"1":{"loc":{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},"type":"if","locations":[{"start":{"line":17,"column":10},"end":{"line":23,"column":11}},{"start":{"line":17,"column":10},"end":{"line":23,"column":11}}],"line":17}},"s":{"0":1,"1":1,"2":5,"3":5,"4":5,"5":0,"6":0,"7":5,"8":5,"9":5,"10":5,"11":0,"12":0,"13":5,"14":5},"f":{"0":1,"1":5,"2":5,"3":5},"b":{"0":[0,5],"1":[0,5]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"f724344b4cbfd0e4a1378aa30d8c8cbfff483af5"}
,"C:\\Git\\DatabaseTest\\dao\\persondao.js": {"path":"C:\\Git\\DatabaseTest\\dao\\persondao.js","statementMap":{"0":{"start":{"line":1,"column":12},"end":{"line":1,"column":31}},"1":{"start":{"line":3,"column":0},"end":{"line":42,"column":2}},"2":{"start":{"line":5,"column":4},"end":{"line":5,"column":73}},"3":{"start":{"line":9,"column":4},"end":{"line":13,"column":6}},"4":{"start":{"line":17,"column":14},"end":{"line":17,"column":51}},"5":{"start":{"line":18,"column":4},"end":{"line":22,"column":6}},"6":{"start":{"line":26,"column":16},"end":{"line":26,"column":62}},"7":{"start":{"line":27,"column":6},"end":{"line":31,"column":6}},"8":{"start":{"line":35,"column":14},"end":{"line":35,"column":23}},"9":{"start":{"line":36,"column":4},"end":{"line":40,"column":6}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":4,"column":2},"end":{"line":4,"column":3}},"loc":{"start":{"line":4,"column":19},"end":{"line":6,"column":3}},"line":4},"1":{"name":"(anonymous_1)","decl":{"start":{"line":8,"column":2},"end":{"line":8,"column":3}},"loc":{"start":{"line":8,"column":23},"end":{"line":14,"column":3}},"line":8},"2":{"name":"(anonymous_2)","decl":{"start":{"line":16,"column":2},"end":{"line":16,"column":3}},"loc":{"start":{"line":16,"column":28},"end":{"line":23,"column":3}},"line":16},"3":{"name":"(anonymous_3)","decl":{"start":{"line":25,"column":2},"end":{"line":25,"column":3}},"loc":{"start":{"line":25,"column":27},"end":{"line":32,"column":3}},"line":25},"4":{"name":"(anonymous_4)","decl":{"start":{"line":34,"column":2},"end":{"line":34,"column":3}},"loc":{"start":{"line":34,"column":28},"end":{"line":41,"column":3}},"line":34}},"branchMap":{},"s":{"0":1,"1":1,"2":1,"3":2,"4":1,"5":1,"6":1,"7":1,"8":0,"9":0},"f":{"0":1,"1":2,"2":1,"3":1,"4":0},"b":{},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"f19959f0769d1c7ec4e41adbee54e8624bc74b41"}
-,"C:\\Git\\DatabaseTest\\dao\\runsqlfile.js": {"path":"C:\\Git\\DatabaseTest\\dao\\runsqlfile.js","statementMap":{"0":{"start":{"line":1,"column":12},"end":{"line":1,"column":28}},"1":{"start":{"line":2,"column":9},"end":{"line":2,"column":22}},"2":{"start":{"line":4,"column":0},"end":{"line":25,"column":2}},"3":{"start":{"line":5,"column":2},"end":{"line":5,"column":54}},"4":{"start":{"line":6,"column":12},"end":{"line":6,"column":45}},"5":{"start":{"line":7,"column":2},"end":{"line":24,"column":5}},"6":{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},"7":{"start":{"line":9,"column":6},"end":{"line":9,"column":50}},"8":{"start":{"line":10,"column":6},"end":{"line":10,"column":13}},"9":{"start":{"line":12,"column":6},"end":{"line":12,"column":43}},"10":{"start":{"line":13,"column":6},"end":{"line":22,"column":9}},"11":{"start":{"line":14,"column":8},"end":{"line":14,"column":29}},"12":{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},"13":{"start":{"line":16,"column":10},"end":{"line":16,"column":27}},"14":{"start":{"line":17,"column":10},"end":{"line":17,"column":17}},"15":{"start":{"line":19,"column":10},"end":{"line":19,"column":44}},"16":{"start":{"line":20,"column":10},"end":{"line":20,"column":17}}},"fnMap":{"0":{"name":"run","decl":{"start":{"line":4,"column":26},"end":{"line":4,"column":29}},"loc":{"start":{"line":4,"column":52},"end":{"line":25,"column":1}},"line":4},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":21},"end":{"line":7,"column":22}},"loc":{"start":{"line":7,"column":42},"end":{"line":24,"column":3}},"line":7},"2":{"name":"(anonymous_2)","decl":{"start":{"line":13,"column":28},"end":{"line":13,"column":29}},"loc":{"start":{"line":13,"column":43},"end":{"line":22,"column":7}},"line":13}},"branchMap":{"0":{"loc":{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},"type":"if","locations":[{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},{"start":{"line":8,"column":4},"end":{"line":23,"column":5}}],"line":8},"1":{"loc":{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},"type":"if","locations":[{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},{"start":{"line":15,"column":8},"end":{"line":21,"column":9}}],"line":15}},"s":{"0":1,"1":1,"2":1,"3":2,"4":2,"5":2,"6":2,"7":2,"8":2,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0},"f":{"0":2,"1":2,"2":0},"b":{"0":[2,0],"1":[0,0]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"2f06c55d8c4effa67b0cfb4aaf1554850548cd7d"}
+,"C:\\Git\\DatabaseTest\\dao\\runsqlfile.js": {"path":"C:\\Git\\DatabaseTest\\dao\\runsqlfile.js","statementMap":{"0":{"start":{"line":1,"column":12},"end":{"line":1,"column":28}},"1":{"start":{"line":2,"column":9},"end":{"line":2,"column":22}},"2":{"start":{"line":4,"column":0},"end":{"line":25,"column":2}},"3":{"start":{"line":5,"column":2},"end":{"line":5,"column":54}},"4":{"start":{"line":6,"column":12},"end":{"line":6,"column":45}},"5":{"start":{"line":7,"column":2},"end":{"line":24,"column":5}},"6":{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},"7":{"start":{"line":9,"column":6},"end":{"line":9,"column":50}},"8":{"start":{"line":10,"column":6},"end":{"line":10,"column":13}},"9":{"start":{"line":12,"column":6},"end":{"line":12,"column":43}},"10":{"start":{"line":13,"column":6},"end":{"line":22,"column":9}},"11":{"start":{"line":14,"column":8},"end":{"line":14,"column":29}},"12":{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},"13":{"start":{"line":16,"column":10},"end":{"line":16,"column":27}},"14":{"start":{"line":17,"column":10},"end":{"line":17,"column":17}},"15":{"start":{"line":19,"column":10},"end":{"line":19,"column":44}},"16":{"start":{"line":20,"column":10},"end":{"line":20,"column":17}}},"fnMap":{"0":{"name":"run","decl":{"start":{"line":4,"column":26},"end":{"line":4,"column":29}},"loc":{"start":{"line":4,"column":52},"end":{"line":25,"column":1}},"line":4},"1":{"name":"(anonymous_1)","decl":{"start":{"line":7,"column":21},"end":{"line":7,"column":22}},"loc":{"start":{"line":7,"column":42},"end":{"line":24,"column":3}},"line":7},"2":{"name":"(anonymous_2)","decl":{"start":{"line":13,"column":28},"end":{"line":13,"column":29}},"loc":{"start":{"line":13,"column":43},"end":{"line":22,"column":7}},"line":13}},"branchMap":{"0":{"loc":{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},"type":"if","locations":[{"start":{"line":8,"column":4},"end":{"line":23,"column":5}},{"start":{"line":8,"column":4},"end":{"line":23,"column":5}}],"line":8},"1":{"loc":{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},"type":"if","locations":[{"start":{"line":15,"column":8},"end":{"line":21,"column":9}},{"start":{"line":15,"column":8},"end":{"line":21,"column":9}}],"line":15}},"s":{"0":1,"1":1,"2":1,"3":2,"4":2,"5":2,"6":2,"7":0,"8":0,"9":2,"10":2,"11":2,"12":2,"13":0,"14":0,"15":2,"16":2},"f":{"0":2,"1":2,"2":2},"b":{"0":[0,2],"1":[0,2]},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"2f06c55d8c4effa67b0cfb4aaf1554850548cd7d"}
,"C:\\Git\\DatabaseTest\\dao\\sum.js": {"path":"C:\\Git\\DatabaseTest\\dao\\sum.js","statementMap":{"0":{"start":{"line":2,"column":2},"end":{"line":2,"column":15}},"1":{"start":{"line":4,"column":0},"end":{"line":4,"column":21}}},"fnMap":{"0":{"name":"sum","decl":{"start":{"line":1,"column":9},"end":{"line":1,"column":12}},"loc":{"start":{"line":1,"column":19},"end":{"line":3,"column":1}},"line":1}},"branchMap":{},"s":{"0":1,"1":1},"f":{"0":1},"b":{},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"00fee04ac2e8dd11e2eec56158ef1e0cec00a19e"}
}
diff --git a/coverage/dao.js.html b/coverage/dao.js.html
index b40a9e6..9a6b25e 100644
--- a/coverage/dao.js.html
+++ b/coverage/dao.js.html
@@ -20,28 +20,28 @@
</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
- <span class="strong">46.67% </span>
+ <span class="strong">73.33% </span>
<span class="quiet">Statements</span>
- <span class='fraction'>7/15</span>
+ <span class='fraction'>11/15</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">25% </span>
+ <span class="strong">50% </span>
<span class="quiet">Branches</span>
- <span class='fraction'>1/4</span>
+ <span class='fraction'>2/4</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">75% </span>
+ <span class="strong">100% </span>
<span class="quiet">Functions</span>
- <span class='fraction'>3/4</span>
+ <span class='fraction'>4/4</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">46.67% </span>
+ <span class="strong">73.33% </span>
<span class="quiet">Lines</span>
- <span class='fraction'>7/15</span>
+ <span class='fraction'>11/15</span>
</div>
</div>
</div>
- <div class='status-line low'></div>
+ <div class='status-line medium'></div>
<pre><table class="coverage">
<tr><td class="line-count quiet">1
2
@@ -81,19 +81,19 @@
<span class="cline-any cline-yes">5x</span>
<span class="cline-any cline-yes">5x</span>
<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-neutral"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-neutral"> </span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-neutral"> </span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
@@ -108,19 +108,19 @@
query(sql, params, callback) {
this.pool.getConnection((err, connection) => {
console.log("dao: connected to database");
- <span class="missing-if-branch" title="else path not taken" >E</span>if (err) {
- console.log("dao: error connecting");
- callback(500, { error: "feil ved ved oppkobling" });
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (err) {
+<span class="cstat-no" title="statement not covered" > console.log("dao: error connecting");</span>
+<span class="cstat-no" title="statement not covered" > callback(500, { error: "feil ved ved oppkobling" });</span>
} else {
-<span class="cstat-no" title="statement not covered" > console.log("dao: running sql: " + sql);</span>
-<span class="cstat-no" title="statement not covered" > connection.query(sql, params, <span class="fstat-no" title="function not covered" >(e</span>rr, rows) => {</span>
-<span class="cstat-no" title="statement not covered" > connection.release();</span>
-<span class="cstat-no" title="statement not covered" > if (err) {</span>
+ console.log("dao: running sql: " + sql);
+ connection.query(sql, params, (err, rows) => {
+ connection.release();
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (err) {
<span class="cstat-no" title="statement not covered" > console.log(err);</span>
<span class="cstat-no" title="statement not covered" > callback(500, { error: "error querying" });</span>
} else {
-<span class="cstat-no" title="statement not covered" > console.log("dao: returning rows");</span>
-<span class="cstat-no" title="statement not covered" > callback(200, rows);</span>
+ console.log("dao: returning rows");
+ callback(200, rows);
}
});
}
@@ -133,7 +133,7 @@
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/coverage/index.html b/coverage/index.html
index e3eb6b9..9f91ceb 100644
--- a/coverage/index.html
+++ b/coverage/index.html
@@ -20,28 +20,28 @@
</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
- <span class="strong">68.33% </span>
+ <span class="strong">81.67% </span>
<span class="quiet">Statements</span>
- <span class='fraction'>41/60</span>
+ <span class='fraction'>49/60</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">62.5% </span>
+ <span class="strong">75% </span>
<span class="quiet">Branches</span>
- <span class='fraction'>10/16</span>
+ <span class='fraction'>12/16</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">80% </span>
+ <span class="strong">93.33% </span>
<span class="quiet">Functions</span>
- <span class='fraction'>12/15</span>
+ <span class='fraction'>14/15</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">68.33% </span>
+ <span class="strong">81.67% </span>
<span class="quiet">Lines</span>
- <span class='fraction'>41/60</span>
+ <span class='fraction'>49/60</span>
</div>
</div>
</div>
- <div class='status-line medium'></div>
+ <div class='status-line high'></div>
<div class="pad1">
<table class="coverage-summary">
<thead>
@@ -72,16 +72,16 @@
</tr>
<tr>
- <td class="file low" data-value="dao.js"><a href="dao.js.html">dao.js</a></td>
- <td data-value="46.67" class="pic low"><div class="chart"><div class="cover-fill" style="width: 46%;"></div><div class="cover-empty" style="width:54%;"></div></div></td>
- <td data-value="46.67" class="pct low">46.67%</td>
- <td data-value="15" class="abs low">7/15</td>
- <td data-value="25" class="pct low">25%</td>
- <td data-value="4" class="abs low">1/4</td>
- <td data-value="75" class="pct medium">75%</td>
- <td data-value="4" class="abs medium">3/4</td>
- <td data-value="46.67" class="pct low">46.67%</td>
- <td data-value="15" class="abs low">7/15</td>
+ <td class="file medium" data-value="dao.js"><a href="dao.js.html">dao.js</a></td>
+ <td data-value="73.33" class="pic medium"><div class="chart"><div class="cover-fill" style="width: 73%;"></div><div class="cover-empty" style="width:27%;"></div></div></td>
+ <td data-value="73.33" class="pct medium">73.33%</td>
+ <td data-value="15" class="abs medium">11/15</td>
+ <td data-value="50" class="pct medium">50%</td>
+ <td data-value="4" class="abs medium">2/4</td>
+ <td data-value="100" class="pct high">100%</td>
+ <td data-value="4" class="abs high">4/4</td>
+ <td data-value="73.33" class="pct medium">73.33%</td>
+ <td data-value="15" class="abs medium">11/15</td>
</tr>
<tr>
@@ -99,15 +99,15 @@
<tr>
<td class="file medium" data-value="runsqlfile.js"><a href="runsqlfile.js.html">runsqlfile.js</a></td>
- <td data-value="52.94" class="pic medium"><div class="chart"><div class="cover-fill" style="width: 52%;"></div><div class="cover-empty" style="width:48%;"></div></div></td>
- <td data-value="52.94" class="pct medium">52.94%</td>
- <td data-value="17" class="abs medium">9/17</td>
- <td data-value="25" class="pct low">25%</td>
- <td data-value="4" class="abs low">1/4</td>
- <td data-value="66.67" class="pct medium">66.67%</td>
- <td data-value="3" class="abs medium">2/3</td>
- <td data-value="52.94" class="pct medium">52.94%</td>
- <td data-value="17" class="abs medium">9/17</td>
+ <td data-value="76.47" class="pic medium"><div class="chart"><div class="cover-fill" style="width: 76%;"></div><div class="cover-empty" style="width:24%;"></div></div></td>
+ <td data-value="76.47" class="pct medium">76.47%</td>
+ <td data-value="17" class="abs medium">13/17</td>
+ <td data-value="50" class="pct medium">50%</td>
+ <td data-value="4" class="abs medium">2/4</td>
+ <td data-value="100" class="pct high">100%</td>
+ <td data-value="3" class="abs high">3/3</td>
+ <td data-value="76.47" class="pct medium">76.47%</td>
+ <td data-value="17" class="abs medium">13/17</td>
</tr>
<tr>
@@ -129,7 +129,7 @@
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/coverage/persondao.js.html b/coverage/persondao.js.html
index 1c3e65d..6aabec7 100644
--- a/coverage/persondao.js.html
+++ b/coverage/persondao.js.html
@@ -154,7 +154,7 @@ module.exports = class PersonDao extends Dao {
updateOne(json, callback){
var val = [json.navn, json.adresse, json.alder, json.id];
super.query(
- "update person set (navn, adresse, alder) values (?,?,?) WHERE id = ?",
+ "update person set navn = ?, adresse = ?, alder = ? WHERE id = ?",
val,
callback
);
@@ -175,7 +175,7 @@ module.exports = class PersonDao extends Dao {
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/coverage/runsqlfile.js.html b/coverage/runsqlfile.js.html
index 9fab294..5a3ca65 100644
--- a/coverage/runsqlfile.js.html
+++ b/coverage/runsqlfile.js.html
@@ -20,24 +20,24 @@
</h1>
<div class='clearfix'>
<div class='fl pad1y space-right2'>
- <span class="strong">52.94% </span>
+ <span class="strong">76.47% </span>
<span class="quiet">Statements</span>
- <span class='fraction'>9/17</span>
+ <span class='fraction'>13/17</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">25% </span>
+ <span class="strong">50% </span>
<span class="quiet">Branches</span>
- <span class='fraction'>1/4</span>
+ <span class='fraction'>2/4</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">66.67% </span>
+ <span class="strong">100% </span>
<span class="quiet">Functions</span>
- <span class='fraction'>2/3</span>
+ <span class='fraction'>3/3</span>
</div>
<div class='fl pad1y space-right2'>
- <span class="strong">52.94% </span>
+ <span class="strong">76.47% </span>
<span class="quiet">Lines</span>
- <span class='fraction'>9/17</span>
+ <span class='fraction'>13/17</span>
</div>
</div>
</div>
@@ -76,19 +76,19 @@
<span class="cline-any cline-yes">2x</span>
<span class="cline-any cline-yes">2x</span>
<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
-<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-neutral"> </span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-no"> </span>
<span class="cline-any cline-neutral"> </span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
@@ -100,19 +100,19 @@ module.exports = function run(filename, pool, done) {
console.log("runsqlfile: reading file " + filename);
let sql = fs.readFileSync(filename, "utf8");
pool.getConnection((err, connection) => {
- <span class="missing-if-branch" title="else path not taken" >E</span>if (err) {
- console.log("runsqlfile: error connecting");
- done();
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (err) {
+<span class="cstat-no" title="statement not covered" > console.log("runsqlfile: error connecting");</span>
+<span class="cstat-no" title="statement not covered" > done();</span>
} else {
-<span class="cstat-no" title="statement not covered" > console.log("runsqlfile: connected");</span>
-<span class="cstat-no" title="statement not covered" > connection.query(sql, <span class="fstat-no" title="function not covered" >(e</span>rr, rows) => {</span>
-<span class="cstat-no" title="statement not covered" > connection.release();</span>
-<span class="cstat-no" title="statement not covered" > if (err) {</span>
+ console.log("runsqlfile: connected");
+ connection.query(sql, (err, rows) => {
+ connection.release();
+ <span class="missing-if-branch" title="if path not taken" >I</span>if (err) {
<span class="cstat-no" title="statement not covered" > console.log(err);</span>
<span class="cstat-no" title="statement not covered" > done();</span>
} else {
-<span class="cstat-no" title="statement not covered" > console.log("runsqlfile: run ok");</span>
-<span class="cstat-no" title="statement not covered" > done();</span>
+ console.log("runsqlfile: run ok");
+ done();
}
});
}
@@ -124,7 +124,7 @@ module.exports = function run(filename, pool, done) {
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/coverage/sum.js.html b/coverage/sum.js.html
index 7f06bfb..a38e441 100644
--- a/coverage/sum.js.html
+++ b/coverage/sum.js.html
@@ -58,7 +58,7 @@ module.exports = sum;</pre></td></tr>
</div><!-- /wrapper -->
<div class='footer quiet pad2 space-top1 center small'>
Code coverage
- generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 14:41:32 GMT+0200 (Vest-Europa (sommertid))
+ generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Sep 24 2018 15:44:46 GMT+0200 (Vest-Europa (sommertid))
</div>
</div>
<script src="prettify.js"></script>
diff --git a/dao/persondao.js b/dao/persondao.js
index eb1fd89..6b8261b 100644
--- a/dao/persondao.js
+++ b/dao/persondao.js
@@ -25,7 +25,7 @@ module.exports = class PersonDao extends Dao {
updateOne(json, callback){
var val = [json.navn, json.adresse, json.alder, json.id];
super.query(
- "update person set (navn, adresse, alder) values (?,?,?) WHERE id = ?",
+ "update person set navn = ?, adresse = ?, alder = ? WHERE id = ?",
val,
callback
);
diff --git a/dao/persondao.test.js b/dao/persondao.test.js
index 630ed58..52e1a11 100644
--- a/dao/persondao.test.js
+++ b/dao/persondao.test.js
@@ -6,10 +6,10 @@ const runsqlfile = require("./runsqlfile.js");
// GitLab CI Pool
var pool = mysql.createPool({
connectionLimit: 1,
- host: "mysql",
- user: "root",
- password: "secret",
- database: "supertestdb",
+ host: "mysql.stud.iie.ntnu.no",
+ user: "jorgaas",
+ password: "sPrzGgz9",
+ database: "jorgaas",
debug: false,
multipleStatements: true
});
@@ -88,7 +88,7 @@ test("update person in db", done => {
}
personDao.updateOne(
- { navn: "Justin Thyme", alder: 21, adresse: "Steet 3", id: 1},
+ { navn: "Justin Thyme", adresse: "Steet 3", alder: 21, id: 1},
callback
);
});
@@ -100,7 +100,7 @@ test("delete person by id in db", done => {
expect(data.affectedRows).toBeGreaterThanOrEqual(1);
done();
}
- personDao.deleteOneByID({id: 2}, callback);
+ personDao.deleteOne({id: 2}, callback);
});
diff --git a/server.js b/server.js
index 3e28234..add5b53 100644
--- a/server.js
+++ b/server.js
@@ -41,4 +41,6 @@ app.post("/person", (req, res) => {
});
});
+
+
var server = app.listen(8080);
--
GitLab