diff --git a/src/main/webapp/app.html b/src/main/webapp/app.html index dfe8ecc7a8dc9513706994409ed1329813806ee9..6a423efb7724d46a5e9d177cc984c4658c4c8b1a 100644 --- a/src/main/webapp/app.html +++ b/src/main/webapp/app.html @@ -17,8 +17,8 @@ </div> <div class="menu"> <ul> - <li><a href="http://129.241.96.52:61208/">Ressursovervåking</a></li> - <li><a href="#">Logg</a></li> + <li><a href="http://129.241.96.56:61208/">Ressursovervåking</a></li> + <li><a href="http://129.241.96.56:3000/d/ESYAe0tnk">Logg</a></li> <li><a href="./settings.html">Innstillinger</a></li> <li><a href="/">Logg ut</a></li> </ul> diff --git a/src/test/java/CalculatorResourceTest.java b/src/test/java/CalculatorResourceTest.java index d7f027e37a08c80e45198ad5c6a2e8af5d232409..d96c4b97d6f9a8d8229877be26cf98aaf2a4c91d 100644 --- a/src/test/java/CalculatorResourceTest.java +++ b/src/test/java/CalculatorResourceTest.java @@ -13,7 +13,7 @@ public class CalculatorResourceTest{ assertEquals(400, calculatorResource.calculate(expression)); expression = " 300 - 99 "; - assertEquals(200, calculatorResource.calculate(expression)); + assertEquals(201, calculatorResource.calculate(expression)); } @Test