Skip to content

Commit

Permalink
Using logger in testalu.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
@metastableB
metastableB committed Jul 19, 2015
1 parent cab60dc commit c55220b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 27 deletions.
3 changes: 2 additions & 1 deletion tests/main.cpp
View file
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
}
52 changes: 26 additions & 26 deletions tests/testalu.cpp
View file
Expand Up @@ -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;
Expand All @@ -20,21 +20,21 @@ 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);
accum.clearAccumulator();
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);
Expand All @@ -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
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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
Expand All @@ -93,21 +93,21 @@ 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);
accum.clearAccumulator();
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);
Expand All @@ -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)
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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");
}


Expand Down
2 changes: 2 additions & 0 deletions tests/testalu.h
View file
Expand Up @@ -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;
Expand Down

0 comments on commit c55220b

Please sign in to comment.