Fined tuned the testing syntax, fixed the header to have ATS_PrintTestStatus.

Author: ricklon

libraries/ArduinoTestSuite/ArduinoTestSuite.cpp

@@ -197,9 +197,10 @@ int	sLen;
 
 
 //************************************************************************
-void	ATS_PrintProperty(	int		propertyTagNum,
-							char	*propertyName,
-							char	*propertyValue)
+//*	this is for internal use only, not made pubic to the API
+static void	ATS_PrintProperty(	int		propertyTagNum,
+								char	*propertyName,
+								char	*propertyValue)
 {
 char	lineBuffer[64];
 

libraries/ArduinoTestSuite/ArduinoTestSuite.h

@@ -25,8 +25,8 @@
 
 
 void	ATS_PrintTestStart(char *manufName, char *testSuiteName);
-void ATS_PrintTestStatus(char *testString, boolean passed);
 void	ATS_PrintTestEnd();
+void	ATS_PrintTestStatus(char *testString, boolean passed);
 boolean	ATS_Test_DigitalPin(uint8_t digitalPinToTest);
 boolean	ATS_Test_PWM_Pin(uint8_t digitalPinToTest);
 boolean	ATS_Test_AnalogInput(uint8_t analogPintoTest);

libraries/ArduinoTestSuite/examples/ATS_Constants/ATS_Constants.pde

@@ -35,50 +35,59 @@ void setup()
   short	ii;
   uint8_t	timerNumber;
   char testName[64];
-  
+
   gYotalErrors	=	0;
   gTestCount		=	0;
 
-/*
+  /*
 * Test Variable Setup
-*/
+   */
 
   Serial.begin(9600);
   delay(1000);
 
   gTestStartTime	=	millis();
   ATS_PrintTestStart("Arduino", "Test of Arduino Constants");
 
-/*
+  /*
 * Run the tests
-*/
-
-
-//test true constant
-  strcpy(testName, "1. Test of true constant");
-  if (true != 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-  ATS_PrintTestStatus(testName, false);
-  }
-
-//test false consts
-  strcpy(testName, "2. Test of false constant");
-  if (false == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-  ATS_PrintTestStatus(testName, false);
-  }
-
-/*
-* Test complete
-*/
+   */
+
+
+  //test true constant
+
+  ATS_PrintTestStatus("1. Test of true constant", true == 1);
+
+  //test false consts
+  ATS_PrintTestStatus( "2. Test of false constant", false == 0);
+
+  //Test of HIGH == 1
+  ATS_PrintTestStatus( "3. Test of HIGH == 1", HIGH == 1);
+
+  //Test of LOW ==  0
+  ATS_PrintTestStatus( "4. Test of LOW ==  0", LOW == 0);
+
+  //Test of INPUT == 1
+  ATS_PrintTestStatus( "5. Test of INPUT == 1", HIGH == 1);
+
+  //Test of OUTPUT ==  0
+  ATS_PrintTestStatus( "6. Test of OUTPUT ==  0", LOW == 0);
+
+  //test decimal
+  ATS_PrintTestStatus( "7. Test of decimal constant", 101 == ((1 * pow(10,2)) + (0 * pow(10,1)) + 1));
+
+  //test binary
+  ATS_PrintTestStatus( "8. Test of binary constant", B101 == 5);
+
+  //test octal
+  ATS_PrintTestStatus( "9. Test of octal constant", 0101 == 65);
+
+  //test hexadecimal
+  ATS_PrintTestStatus( "7. Test of hexadecimal constant", (0x101 == 257));
+
+  /*
+  * Test complete
+   */
   ATS_PrintTestEnd();
 
 }
@@ -93,3 +102,4 @@ void loop()
 
 
 
+

libraries/ArduinoTestSuite/examples/ATS_StringTest/ATS_StringTest.pde

@@ -29,15 +29,15 @@
 #define	kBoard_AnalogCount	16
 #endif
 
+
 //************************************************************************
 void setup()
 {
+
   short	ii;
   uint8_t	timerNumber;
   char testName[64];
 
-
-
   gYotalErrors	=	0;
   gTestCount		=	0;
 
@@ -56,92 +56,136 @@ void setup()
   gTestStartTime	=	millis();
   ATS_PrintTestStart("Arduino", "String Test");
 
+
   /*
 * Run the tests
    */
 
   // adding a constant integer to a string:
   stringThree =  stringOne + 123;
-  strcpy(charResult,  "\0");
+  //strcpy(charResult,  "\0");
   stringThree.toCharArray(charResult, sizeof(charResult));
 
-  strcpy(testName, "Adding a constant integer to a string:");
-  if (strcmp(charResult,"stringThree = 123" ) == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-    ATS_PrintTestStatus(testName, false);
-  }
-
-
+  ATS_PrintTestStatus("1. Adding a constant integer to a string:", strcmp(charResult,"stringThree = 123" ) == 0);
 
   // adding a constant long interger to a string:
   stringThree = stringOne + 123456789;
   stringThree.toCharArray(charResult, sizeof(charResult));
 
-  strcpy(testName, "Adding a constant long interger to a string");
-  if (strcmp(charResult,"stringThree = 123456789" )  == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-    ATS_PrintTestStatus(testName, false);
-  }
+  ATS_PrintTestStatus("2. Adding a constant long interger to a string", strcmp(charResult,"stringThree = 123456789" )  == 0);
 
 
   // adding a constant character to a string:
   stringThree =  stringOne + 'A';
   stringThree.toCharArray(charResult, sizeof(charResult));
 
-  strcpy(testName, "Adding a constant character to a string");
-  if (strcmp(charResult,"stringThree = A" ) == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-    ATS_PrintTestStatus(testName, false);
-  }
-
+  ATS_PrintTestStatus("3. Adding a constant character to a string", strcmp(charResult,"stringThree = A" ) == 0);
 
 
   // adding a constant string to a string:
   stringThree =  stringOne +  "abc";
   stringThree.toCharArray(charResult, sizeof(charResult));
 
-  strcpy(testName, "Adding a constant string variable to a string");
-  if (strcmp(charResult,"stringThree = abc" )  == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-    ATS_PrintTestStatus(testName, false);
-  }
+  ATS_PrintTestStatus("4. Adding a constant string variable to a string", strcmp(charResult,"stringThree = abc" )  == 0);
 
+  //"5. Adding a constant long interger to a string"
   stringThree = stringOne + stringTwo;
   stringThree.toCharArray(charResult, sizeof(charResult));
 
-  strcpy(testName, "Adding a constant long interger to a string");
-  if (strcmp(charResult,"stringThree = this string" )  == 0)
-  {
-    ATS_PrintTestStatus(testName, true);
-  }
-  else
-  {
-    ATS_PrintTestStatus(testName, false);
-  }
+  ATS_PrintTestStatus("5. Adding a constant long interger to a string", strcmp(charResult,"stringThree = this string" )  == 0);
+
+
+  /*
+* setup up String Comparison Operater Tests
+   */
+
+  stringOne = String("this");
+  stringTwo = String("that");
+
+  // two strings equal:
+  ATS_PrintTestStatus("6. Two strings equal",stringOne == "this");
+
+  // two strings not equal:
+  ATS_PrintTestStatus("7. Two strings not equal",stringOne != stringTwo);
+
+  // two strings not equal (case sensitivity matters):
+  stringOne = "This";
+  stringTwo = "this";
+  ATS_PrintTestStatus("8. Two strings not equal [case sensitivity matters]", stringOne != stringTwo);
+
+  // you can also use equals() to see if two strings are the same:
+  stringOne = "this";
+  stringTwo = "this";
+  ATS_PrintTestStatus("9. Equals() method equals", stringOne.equals(stringTwo));
+
+
+  // you can also use not equals() to see if two strings are not the same:
+  stringOne = String("This");
+  stringTwo = String("this");
+  ATS_PrintTestStatus("10. Not equals() method equals", !stringOne.equals(stringTwo));
+
+  // or perhaps you want to ignore case:
+  ATS_PrintTestStatus("11.  EqualsIgnoreCase() method equals", stringOne.equalsIgnoreCase(stringTwo));
+
+  // a numeric string compared to the number it represents:
+  stringOne = "1";
+  int numberOne = 1;
+  ATS_PrintTestStatus("12.  A numeric string compared to the number it represents", stringOne == numberOne);
 
+  // two numeric strings compared:
+  stringOne = "2";
+  stringTwo = "1";
+  ATS_PrintTestStatus("13.  Two numeric strings compared",stringOne >= stringTwo);
+
+
+  // comparison operators can be used to compare strings for alphabetic sorting too:
+
+
+  stringOne = String("Brown");
+  // ATS_PrintTestStatus("14.  comparison operator < can be used to compare strings for alphabetic sorting ",stringOne < "Charles");
+  //  ATS_PrintTestStatus("15.  comparison operator > can be used to compare strings for alphabetic sorting ",stringOne > "Adams");
+  //  ATS_PrintTestStatus("16.  comparison operator <= can be used to compare strings for alphabetic sorting ",stringOne <= "Browne");
+  //  ATS_PrintTestStatus("17.  comparison operator >= can be used to compare strings for alphabetic sorting ",stringOne >= "Brow");
+
+
+
+  // the compareTo() operator also allows you to compare strings
+  stringOne = "Cucumber";
+  stringTwo = "Cucuracha";
+
+  ATS_PrintTestStatus("18.  The compareTo() operator also allows you to compare strings", stringOne.compareTo(stringTwo) < 0);
+
+  // compareTo() String with numnber > String with number:
+  stringOne = "Sensor: 50";
+  stringTwo=  "Sensor: 150";
+  ATS_PrintTestStatus("19.  The compareTo() String with integers", stringOne.compareTo(stringTwo) < 0);
+
+  // compareTo() String with numnber > String with number append integer, matches example code:
+  stringOne = "Sensor: ";
+  stringTwo=  "Sensor: ";
+  stringOne += 50;
+  stringTwo += 150;
+  ATS_PrintTestStatus("20.  The compareTo()  compare strings with appended integers", stringOne.compareTo(stringTwo) < 0);
 
 
   /*
-* Test complete
+* setup up String Append Operation Tests
+   */
+  // Serious awful problem here
+  stringOne = String("Sensor ");
+  stringTwo = String("value");
+
+  stringOne += stringTwo;
+  // ATS_PrintTestStatus("N. Adding string to string += ",(strcmp(charResult,"Sensor value" )  == 0));
+  //ATS_PrintTestStatus("N. Adding string to string += ", stringOne.equals("Sensor value"));
+
+  ATS_PrintTestStatus("21.  The compareTo()  compare strings with appended integers", stringOne.compareTo(stringTwo) < 0);
+  /*
+    * Test complete
    */
   ATS_PrintTestEnd();
 
+
 }
 
 
@@ -155,3 +199,9 @@ void loop()
 
 
 
+
+
+
+
+
+