diff --git a/tests/main.cpp b/tests/main.cpp index 51d9c98..54ae72a 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -17,6 +17,7 @@ int main(int argc , char *argv[]) { std::string report; + std::cout << "Starting tests, logging to stderr\n"; #ifdef TEST_DEKATRON TestDekatron dekatron; std::cout <<"\n"; @@ -47,5 +48,5 @@ int main(int argc , char *argv[]) { std::cout <<"\n"; report += "\nalu.cpp Failures = " + std::to_string(alu.failedTests); #endif /*TEST_ALU*/ - std::cout << "\n:::END TEST:::\n" << report <<"\n\n"; + std::cout << "\nAll Tests Finished\n:::REPORT:::" << report <<"\n\n"; } diff --git a/tests/testalu.cpp b/tests/testalu.cpp index fc3fc62..3195e83 100644 --- a/tests/testalu.cpp +++ b/tests/testalu.cpp @@ -9,7 +9,7 @@ #include "testalu.h" TestALU::TestALU(){ - std::cout << "Testing alu.cpp (mult. & div.)"<< std::endl; + logObj.log(LogLevel::INFO, "testalu.cpp", "Testing alu.cpp (multiplication)\n"); DekatronStore source,destination; Dekatron newState[9]; Accumulator accum; @@ -20,10 +20,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("0146410000000000") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 1.1 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 1.1 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 1.1 multiply() FAILURE " << accum.getStringStateInStore() << " vs 0146410000000000\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 1.1 multiply() FAILURE " +accum.getStringStateInStore()+" vs 0146410000000000\n"); } source.setStoreValue("099999999",newState); destination.setStoreValue("011111111",newState); @@ -31,10 +31,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("1111111088888889") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 1.2 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 1.2 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 1.2 multiply() FAILURE " << accum.getStringStateInStore() << " vs 0146410000000000\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 1.2 multiply() FAILURE " +accum.getStringStateInStore()+" vs 0146410000000000\n"); } source.setStoreValue("099998888",newState); @@ -43,10 +43,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("8888901054321112") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 1.3 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 1.3 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 1.3 multiply() FAILURE " << accum.getStringStateInStore() << " vs 8 8888 0105 4321 112\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 1.3 multiply() FAILURE " +accum.getStringStateInStore()+" vs 8 8888 0105 4321 112\n"); } // -ve * +ve // -121*121 = -(1.4641) = 9 8535 8999 9999 999 @@ -56,10 +56,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("9853589999999999") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 2.1 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 2.1 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 2.1 multiply() FAILURE " << accum.getStringStateInStore() << " vs 9 8535 8999 9999 999\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 2.1 multiply() FAILURE " +accum.getStringStateInStore()+" vs 9 8535 8999 9999 999\n"); } //- 3.0 * 4.0 = -(12.0) overflow = 8 7999 9999 9999 999 source.setStoreValue("969999999",newState); @@ -68,10 +68,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("8799999999999999") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 2.2 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 2.2 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 2.2 multiply() FAILURE " << accum.getStringStateInStore() << " vs 8 7999 9999 9999 999\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 2.2 multiply() FAILURE " +accum.getStringStateInStore()+" vs 8 7999 9999 9999 999\n"); } // - 0000 1111 * 8888 9999 = - 0000 9875 6788 889= 9 9999 0124 3211 110 source.setStoreValue("999998888",newState); @@ -80,10 +80,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("9999901243211110") && !destination.getStringStateInStore().compare("000000000")) - std::cout << "ALU TEST 2.3 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 2.3 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 2.3 multiply() FAILURE " << accum.getStringStateInStore() << " vs 9 9999 0124 3211 110\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 2.3 multiply() FAILURE " +accum.getStringStateInStore()+" vs 9 9999 0124 3211 110\n"); } // +ve * -ve @@ -93,10 +93,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("9853589999999999") && !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 3.1 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 3.1 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 3.1 multiply() FAILURE " << accum.getStringStateInStore() << " vs 9 8535 8999 9999 999\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 3.1 multiply() FAILURE " +accum.getStringStateInStore()+" vs 9 8535 8999 9999 999\n"); } source.setStoreValue("090000000",newState); destination.setStoreValue("909999999",newState); @@ -104,10 +104,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("1899999999999999") && !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 3.2 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 3.2 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 3.2 multiply() FAILURE " << accum.getStringStateInStore() << " vs 1 8999 9999 9999 999\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 3.2 multiply() FAILURE " +accum.getStringStateInStore()+" vs 1 8999 9999 9999 999\n"); } source.setStoreValue("099000000",newState); @@ -116,10 +116,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("8777777877999999") && !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 3.3 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 3.3 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 3.3 multiply() FAILURE " << accum.getStringStateInStore() << " vs 8 7777 7787 7999 999\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 3.3 multiply() FAILURE " +accum.getStringStateInStore()+" vs 8 7777 7787 7999 999\n"); } // -ve * -ve // -121*-121 = (1.4641) @@ -129,10 +129,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); //0146410000000000 if(!accum.getStringStateInStore().compare("0146410000000000") && !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 4.1 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 4.1 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 4.1 multiply() FAILURE " << accum.getStringStateInStore() << " vs 0 1464 1000 0000 000\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 4.1 multiply() FAILURE " +accum.getStringStateInStore()+" vs 0 1464 1000 0000 000\n"); } //- 3.0 * - 4.0 = +(12.0) overflow = 1 2000 0000 source.setStoreValue("969999999",newState); @@ -141,10 +141,10 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("1200000000000000") && !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 4.2 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 4.2 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 4.2 multiply() FAILURE " << accum.getStringStateInStore() << " vs 1 2000 0000 0000 000\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 4.2 multiply() FAILURE " +accum.getStringStateInStore()+" vs 1 2000 0000 0000 000\n"); } // - 0000 1111 * - 8888 9999 = + 0000 9875 6788 889 source.setStoreValue("999998888",newState); @@ -153,12 +153,12 @@ TestALU::TestALU(){ alu.multiply(&source,&destination,&accum); if(!accum.getStringStateInStore().compare("0000098756788889")&& !destination.getStringStateInStore().compare("999999999")) - std::cout << "ALU TEST 4.3 SUCCESSFUL \n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "ALU TEST 4.3 SUCCESSFUL \n"); else{ failedTests++; - std::cout << "ALU TEST 4.3 multiply() FAILURE " << accum.getStringStateInStore() << " vs 0 0000 9875 6788 889\n"; + logObj.log(LogLevel::WARNING, "testalu.cpp", "ALU TEST 4.3 multiply() FAILURE " +accum.getStringStateInStore()+" vs 0 0000 9875 6788 889\n"); } - std::cout << "FINISH multiplycircuit.cpp TESTS\n"; + logObj.log(LogLevel::INFO, "testalu.cpp", "FINISH multiplycircuit.cpp TESTS\n"); } diff --git a/tests/testalu.h b/tests/testalu.h index 17dd93d..1a952f5 100644 --- a/tests/testalu.h +++ b/tests/testalu.h @@ -14,8 +14,10 @@ #include "../src/dekatron.h" #include "../src/accumulator.h" #include "../src/dekatron.h" +#include "../src/lib/logger.h" class TestALU { + Logger logObj; ALU alu; public: int failedTests = 0;