merge

test/test.cpp

@@ -30,7 +30,7 @@ TEST_CASE( "basic division", "[calc]"){
 TEST_CASE( "Test modulo function", "[calc]") {
   REQUIRE( evaluate("11%") == 0 );
   REQUIRE( evaluate("32%") == 1 );
-  REQUIRE( evaluate("51%") == 4 );
+  REQUIRE( evaluate("51%") == 0 );
 }
 
 TEST_CASE("Test sqrt function", "[calc]") {
@@ -38,3 +38,9 @@ TEST_CASE("Test sqrt function", "[calc]") {
   REQUIRE( evaluate("49sqrt") == 7 );
   REQUIRE( evaluate("0sqrt") == 0 );
 }
+
+TEST_CASE( "Basic power test", "[calc]") {
+  REQUIRE( evaluate("22^") == 4 );
+  REQUIRE( evaluate("43^") == 64 );
+  REQUIRE( evaluate("25^") == 32 );
+}