enhance test : range

include/Test.h

@@ -6,12 +6,25 @@
 class Test {
  public :
   Test( bool verbose );
-  static bool assertEqual( std::string result, std::string expectation );
-  static bool assertNotEqual( std::string result, std::string expectation );
+
+  bool print_assertEqual( std::string result, std::string expectation );
+  bool do_assertEqual( std::string result, std::string expectation );
+  bool assertEqual( std::string result, std::string expectation );
+
+  bool print_assertNotEqual( std::string result, std::string expectation );
+  bool do_assertNotEqual( std::string result, std::string expectation );
+  bool assertNotEqual( std::string result, std::string expectation );
+
+  bool print_assertInRange( int value, int min, int max );
+  bool do_assertInRange( int value, int min, int max );
+  bool assertInRange( int value, int min, int max );
+
+  bool print_assertNotInRange( int value, int min, int max );
+  bool do_assertNotInRange( int value, int min, int max );
+  bool assertNotInRange( int value, int min, int max );
 
  private :
-  bool verbose;
-  
+  bool verbose ;  
 };
 
 #endif

main_debug.cpp

@@ -1,39 +0,0 @@
-#include <iostream>
-#include <string>
-#include "include/Crypt.h"
-#include "include/Test.h"
-
-char START = START;
-char END = END;
-
-/**
- @brief Take a string on command line argument to encrypt it. For vigenere encnyption, the text is encrypted with itself as a key
- **/
-int main( int argc, char* argv[]  )
-{
-    std::string txt = argv[1] ;
-
-  if( argc < 1 ){
-    std::cout << "Missing argument : need sentance to encrypt" << std::endl;
-    return 0;
-  }
-  if( argc > 1 ){
-    START = argv[2][0] ;
-  }
-  if( argc > 2 ){
-    END = argv[3][0] ;
-  }
-
-  std::string test_1 = "la mer à boire" ;
-  std::string test_2 = "xyzabc" ;
-  
-  Test::assertEqual( Crypt::cesar( test_1, 3, START, END ), "od phu à erluh") ;
-  Test::assertEqual( Crypt::vigenere( test_1, test_1, START, END ), "xb zjj à ddrjj") ;
-  Test::assertEqual( Crypt::atbash( test_1, START, END ), "oz nvi à ylriv") ;
-
-  Test::assertEqual( Crypt::cesar( test_2, 3, START, END ), "abcdef") ;
-  Test::assertEqual( Crypt::vigenere( test_2, test_1, START, END ), "jzzngu") ;
-  Test::assertEqual( Crypt::atbash( test_2, START, END ), "cbazyx") ;
-  
-  return 0;
-}

src/Test.cpp

@@ -1,29 +1,97 @@
 #include "../include/Test.h"
 
 Test::Test( bool verbose = true ){
-  this->verbose = verbose;
+  this->verbose = verbose ;
 }
 
-bool Test::assertEqual( std::string result, std::string expected )
+bool Test::print_assertEqual( std::string result, std::string expected )
 {
-  if ( result == expected ){
-    std::cout << "[\033[32msuccess\033[0m] : result equals expectation : \033[36m" << result << "\033[0m" << std::endl;
+  if (Test::do_assertEqual( result, expected )){
+    std::cout << "[\033[32msuccess\033[0m] : result equals expectation : \033[36m" << result << "\033[0m" << std::endl ;
     return true;
   }else{
-    std::cout << "[\033[31mfailure\033[0m] : result \033[36m: " << result << "\033[0m" << std::endl
-	      << "            expectation :\033[36m" << expected << std::endl;
+    std::cout << "[\033[31mfailure\033[0m] : result \033[36m: " << result << "\033[0m" << " ≠ \033[36m" << expected << std::endl;
     return false;
   }
 }
 
-bool Test::assertNotEqual( std::string result, std::string expected )
+bool Test::do_assertEqual( std::string result, std::string expected )
+{
+  return ( result == expected );
+}
+
+bool Test::assertEqual( std::string result, std::string expected )
+{
+  return ( this->verbose )?
+    Test::print_assertEqual( result, expected ):
+    Test::do_assertEqual( result, expected );
+}
+
+bool Test::print_assertNotEqual( std::string result, std::string expected )
 {
-  if ( result == expected ){
+  if ( Test::do_assertNotEqual( result, expected ) ){
     std::cout << "[\033[31mfailure\033[0m] : result equals expectation : \033[36m" << result << "\033[0m" << std::endl;
+    return true;
+  }else{
+    std::cout << "[\033[32msuccess\033[0m] : \033[36m" << result << "\033[0m" << " ≠ \033[36m" << expected << "\033[0m" << std::endl;
     return false;
+  }
+}
+
+bool Test::do_assertNotEqual( std::string result, std::string expected )
+{
+  return !Test::assertEqual( result, expected );
+}
+
+bool Test::assertNotEqual( std::string result, std::string expected )
+{
+  return ( this->verbose )?
+    Test::print_assertNotEqual( result, expected ):
+    Test::do_assertNotEqual( result, expected );
+}
+
+bool Test::assertInRange( int value, int min, int max ){
+  return (this->verbose)?
+    Test::print_assertInRange( value, min, max ) :
+    Test::do_assertInRange( value, min, max ) ;
+}
+
+bool Test::do_assertInRange( int value, int min, int max ){
+  return ( value < min || value > max )?
+    false :
+    true ;
+}
+
+bool Test::print_assertInRange( int value, int min, int max ){
+  if( Test::do_assertInRange( value, min, max ) ){
+    std::cout << "[\033[32msuccess\033[0m] : \033[36m" << value << "\033[0m" << " in \033[36m[" << min << ";" << max << "]\033[0m" << std::endl ;
+    return true;
   }else{
-    std::cout << "[\033[32msuccess\033[0m] : result : \033[36m" << result << "\033[0m" << std::endl
-	      << "            expectation : \033[36m" << expected << "\033[0m" << std::endl;
+    std::cout << "[\033[31mfailure\033[0m] : \033[36m" << value << "\033[0m" << " not in \033[36m[" << min << ";" << max << "]\033[0m" << std::endl ;
+    return false;
+  }
+}
+
+bool Test::assertNotInRange( int value, int min, int max ){
+  return (this->verbose)?
+    Test::print_assertNotInRange( value, min, max ) :
+    Test::do_assertNotInRange( value, min, max ) ;
+}
+
+bool Test::do_assertNotInRange( int value, int min, int max ){
+  return ( value < min || value > max )?
+    true :
+    false ;
+}
+
+bool Test::print_assertNotInRange( int value, int min, int max ){
+  if( Test::do_assertNotInRange( value, min, max ) ){
+    std::cout << "[\033[32msuccess\033[0m] : value : \033[36m" << value << "\033[0m" << std::endl
+	      << "            range : \033[36m[" << min << ";" << max << "]\033[0m" << std::endl;
     return true;
+  }else{
+    std::cout << "[\033[31mfailure\033[0m] : value in range : \033[36m" << value << "\033[0m" << std::endl
+	      << "            range : \033[36m[" << min << ";" << max << "]\033[0m" << std::endl;
+    return false;
   }
 }