Merge pull request #47 from bxparks/develop

1.2.1 - support 64-bit integers in assert statements

Author: bxparks

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+* 1.2.1 (2018-12-22)
+    * Add support for 64-bit integers (`long long` and `unsigned long long`)
+      for various `assertXxx()` statements. Exceptions are: `assertNear()` and
+      `assertNotNear()` which do not support 64-bit integers. This is considered
+      a minor-point release (1.2.1 instead of 1.3) because the user-visible API
+      does not change, just extends to 64-bit integer types.
+    * Add `ASSERT_NEAR()` macro to `contrib/gtest.h` (thanks ciband@).
 * 1.2 (2018-12-01)
     * Add overloaded 2-argument versions of test() and testing() macros to match
       the TEST() macro in Google Test which takes 2 arguments.

README.md

@@ -9,7 +9,7 @@ AVR, ESP8266, ESP32 and Teensy platforms. The sister AUniter project provides
 command line tools to verify, upload and validate the unit tests. The AUniter
 tools can be used in a continuous integration system like Jenkins.
 
-Version: 1.2 (2018-12-01)
+Version: 1.2.1 (2018-12-22)
 
 [![AUniter Jenkins Badge](https://us-central1-xparks2018.cloudfunctions.net/badge?project=AUnit)](https://github.com/bxparks/AUniter)
 
@@ -99,6 +99,8 @@ Here are the features in AUnit which are not available in ArduinoUnit 2.2:
 * Approximate comparisons:
     * `assertNear()`
     * `asssertNotNear()`
+* Supports 64-bit integer
+    * `assertXxx()` support both `long long` and `unsigned long long`
 * `test()` and `testing()` macros support both 1 and 2 arguments
     * `test(testName)` and `test(suiteName, testName)`
     * `testing(testName)` and `testing(suiteName, testName)`
@@ -411,7 +413,7 @@ are available. These are essentially identical to ArduinoUnit:
 #### Supported Parameter Types
 
 The 6 core assert macros (assertEqual, assertNotEqual, assertLess, assertMore,
-assertLessOrEqual, assertMoreOrEqual) support the following 16
+assertLessOrEqual, assertMoreOrEqual) support the following 18
 combinations for their parameter types:
 
 * `(bool, bool)`
@@ -420,6 +422,8 @@ combinations for their parameter types:
 * `(unsigned int, unsigned int)`
 * `(long, long)`
 * `(unsigned long, unsigned long)`
+* `(long long, long long)`
+* `(unsigned long long, unsigned long long)`
 * `(double, double)`
 * `(const char *, const char *)`
 * `(const char *, const String&)`
@@ -577,7 +581,8 @@ list of supported types is:
 * `double`
 
 Other primitive types (e.g. `char` or `float`) will be automatically converted
-to one of these supported types by the compiler.
+to one of these supported types by the compiler. (64-bit integer types
+`long long` and `unsigned long long` are not supported here.)
 
 Note that the `abs()` of 2 values of a signed integer type can be larger than
 the maximum value that can be represented by the given signed type. Since signed
@@ -1217,6 +1222,7 @@ their equivalent macros in AUnit:
 * `ASSERT_STRCASENE(e, a)` - `assertStringCaseNotEqual()`
 * `ASSERT_TRUE(x)` - `assertTrue()`
 * `ASSERT_FALSE(x)` - `assertFalse()`
+* `ASSERT_NEAR(e, a, error)` - `assertNear()`
 
 To use the `gtest.h` adapter, include the following headers:
 ```C++

docs/doxygen.cfg

@@ -38,7 +38,7 @@ PROJECT_NAME           = "AUnit"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.2
+PROJECT_NUMBER         = 1.2.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

docs/html/AUnitVerbose_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">AUnit
-   &#160;<span id="projectnumber">1.2</span>
+   &#160;<span id="projectnumber">1.2.1</span>
    </div>
    <div id="projectbrief">Unit testing framework for Arduino platforms inspired by ArduinoUnit and Google Test.</div>
   </td>
@@ -73,7 +73,8 @@
 
 <p>Same as <a class="el" href="AUnit_8h.html" title="Same as AUnitVerbose.h except that the terse versions of the various assertXxx() macros are provided...">AUnit.h</a> except that the verbose versions of the various assertXxx() macros are provided.  
 <a href="#details">More...</a></p>
-<div class="textblock"><code>#include &quot;aunit/Verbosity.h&quot;</code><br />
+<div class="textblock"><code>#include &quot;<a class="el" href="print64_8h_source.html">aunit/print64.h</a>&quot;</code><br />
+<code>#include &quot;aunit/Verbosity.h&quot;</code><br />
 <code>#include &quot;<a class="el" href="Compare_8h_source.html">aunit/Compare.h</a>&quot;</code><br />
 <code>#include &quot;aunit/Printer.h&quot;</code><br />
 <code>#include &quot;aunit/Test.h&quot;</code><br />
@@ -90,20 +91,21 @@
 <div class="dyncontent">
 <div class="center"><img src="AUnitVerbose_8h__incl.png" border="0" usemap="#_2home_2brian_2dev_2AUnit_2src_2AUnitVerbose_8h" alt=""/></div>
 <map name="_2home_2brian_2dev_2AUnit_2src_2AUnitVerbose_8h" id="_2home_2brian_2dev_2AUnit_2src_2AUnitVerbose_8h">
-<area shape="rect" id="node2" href="Verbosity_8h_source.html" title="aunit/Verbosity.h" alt="" coords="922,468,1042,495"/>
-<area shape="rect" id="node4" href="Compare_8h.html" title="This file provides overloaded compareXxx(a, b) functions which are used by the various assertXxx(a..." alt="" coords="5,244,124,271"/>
-<area shape="rect" id="node6" href="Printer_8h_source.html" title="aunit/Printer.h" alt="" coords="251,319,353,345"/>
-<area shape="rect" id="node7" href="Test_8h_source.html" title="aunit/Test.h" alt="" coords="914,393,1005,420"/>
-<area shape="rect" id="node9" href="Assertion_8h_source.html" title="aunit/Assertion.h" alt="" coords="727,319,847,345"/>
-<area shape="rect" id="node11" href="MetaAssertion_8h_source.html" title="aunit/MetaAssertion.h" alt="" coords="301,244,450,271"/>
-<area shape="rect" id="node12" href="TestOnce_8h_source.html" title="aunit/TestOnce.h" alt="" coords="229,169,351,196"/>
-<area shape="rect" id="node13" href="TestAgain_8h_source.html" title="aunit/TestAgain.h" alt="" coords="427,169,551,196"/>
-<area shape="rect" id="node14" href="TestRunner_8h_source.html" title="aunit/TestRunner.h" alt="" coords="922,319,1055,345"/>
-<area shape="rect" id="node15" href="AssertVerboseMacros_8h.html" title="Verbose versions of the macros in AssertMacros.h. " alt="" coords="981,95,1175,121"/>
-<area shape="rect" id="node16" href="MetaAssertMacros_8h.html" title="Various assertTestXxx(), checkTestXxx(), assertTestXxxF() and checkTestXxxF() macros are defined in t..." alt="" coords="801,244,976,271"/>
-<area shape="rect" id="node17" href="TestMacros_8h.html" title="Various macros (test(), testF(), testing(), testingF(), externTest(), externTestF(), externTesting(), externTestingF()) are defined in this header. " alt="" coords="572,95,707,121"/>
-<area shape="rect" id="node8" href="FCString_8h_source.html" title="FCString.h" alt="" coords="445,468,530,495"/>
-<area shape="rect" id="node10" href="Flash_8h.html" title="Various macros to smooth over the differences among the various platforms with regards to their suppo..." alt="" coords="731,393,796,420"/>
+<area shape="rect" id="node2" href="print64_8h.html" title="Helper routines to print &#39;long long&#39; and &#39;unsigned long long&#39; because the Print::print() methods in P..." alt="" coords="51,95,155,121"/>
+<area shape="rect" id="node5" href="Verbosity_8h_source.html" title="aunit/Verbosity.h" alt="" coords="858,468,978,495"/>
+<area shape="rect" id="node7" href="Compare_8h.html" title="This file provides overloaded compareXxx(a, b) functions which are used by the various assertXxx(a..." alt="" coords="141,244,260,271"/>
+<area shape="rect" id="node8" href="Printer_8h_source.html" title="aunit/Printer.h" alt="" coords="208,319,311,345"/>
+<area shape="rect" id="node9" href="Test_8h_source.html" title="aunit/Test.h" alt="" coords="1071,393,1162,420"/>
+<area shape="rect" id="node11" href="Assertion_8h_source.html" title="aunit/Assertion.h" alt="" coords="1057,319,1177,345"/>
+<area shape="rect" id="node13" href="MetaAssertion_8h_source.html" title="aunit/MetaAssertion.h" alt="" coords="437,244,586,271"/>
+<area shape="rect" id="node14" href="TestOnce_8h_source.html" title="aunit/TestOnce.h" alt="" coords="351,169,474,196"/>
+<area shape="rect" id="node15" href="TestAgain_8h_source.html" title="aunit/TestAgain.h" alt="" coords="549,169,673,196"/>
+<area shape="rect" id="node16" href="TestRunner_8h_source.html" title="aunit/TestRunner.h" alt="" coords="1346,319,1479,345"/>
+<area shape="rect" id="node17" href="AssertVerboseMacros_8h.html" title="Verbose versions of the macros in AssertMacros.h. " alt="" coords="1103,95,1298,121"/>
+<area shape="rect" id="node18" href="MetaAssertMacros_8h.html" title="Various assertTestXxx(), checkTestXxx(), assertTestXxxF() and checkTestXxxF() macros are defined in t..." alt="" coords="1003,244,1177,271"/>
+<area shape="rect" id="node19" href="TestMacros_8h.html" title="Various macros (test(), testF(), testing(), testingF(), externTest(), externTestF(), externTesting(), externTestingF()) are defined in this header. " alt="" coords="683,95,817,121"/>
+<area shape="rect" id="node10" href="FCString_8h_source.html" title="FCString.h" alt="" coords="581,468,666,495"/>
+<area shape="rect" id="node12" href="Flash_8h.html" title="Various macros to smooth over the differences among the various platforms with regards to their suppo..." alt="" coords="981,393,1047,420"/>
 </map>
 </div>
 </div>
@@ -112,7 +114,7 @@
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
 Macros</h2></td></tr>
 <tr class="memitem:a87cbb10969eff63f8ae66afc4e9457eb"><td class="memItemLeft" align="right" valign="top"><a id="a87cbb10969eff63f8ae66afc4e9457eb"></a>
-#define&#160;</td><td class="memItemRight" valign="bottom"><b>AUNIT_VERSION</b>&#160;&#160;&#160;010200</td></tr>
+#define&#160;</td><td class="memItemRight" valign="bottom"><b>AUNIT_VERSION</b>&#160;&#160;&#160;010201</td></tr>
 <tr class="separator:a87cbb10969eff63f8ae66afc4e9457eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>

docs/html/AUnitVerbose_8h__incl.map

@@ -1,16 +1,17 @@
 <map id="/home/brian/dev/AUnit/src/AUnitVerbose.h" name="/home/brian/dev/AUnit/src/AUnitVerbose.h">
-<area shape="rect" id="node2" href="$Verbosity_8h_source.html" title="aunit/Verbosity.h" alt="" coords="922,468,1042,495"/>
-<area shape="rect" id="node4" href="$Compare_8h.html" title="This file provides overloaded compareXxx(a, b) functions which are used by the various assertXxx(a..." alt="" coords="5,244,124,271"/>
-<area shape="rect" id="node6" href="$Printer_8h_source.html" title="aunit/Printer.h" alt="" coords="251,319,353,345"/>
-<area shape="rect" id="node7" href="$Test_8h_source.html" title="aunit/Test.h" alt="" coords="914,393,1005,420"/>
-<area shape="rect" id="node9" href="$Assertion_8h_source.html" title="aunit/Assertion.h" alt="" coords="727,319,847,345"/>
-<area shape="rect" id="node11" href="$MetaAssertion_8h_source.html" title="aunit/MetaAssertion.h" alt="" coords="301,244,450,271"/>
-<area shape="rect" id="node12" href="$TestOnce_8h_source.html" title="aunit/TestOnce.h" alt="" coords="229,169,351,196"/>
-<area shape="rect" id="node13" href="$TestAgain_8h_source.html" title="aunit/TestAgain.h" alt="" coords="427,169,551,196"/>
-<area shape="rect" id="node14" href="$TestRunner_8h_source.html" title="aunit/TestRunner.h" alt="" coords="922,319,1055,345"/>
-<area shape="rect" id="node15" href="$AssertVerboseMacros_8h.html" title="Verbose versions of the macros in AssertMacros.h. " alt="" coords="981,95,1175,121"/>
-<area shape="rect" id="node16" href="$MetaAssertMacros_8h.html" title="Various assertTestXxx(), checkTestXxx(), assertTestXxxF() and checkTestXxxF() macros are defined in t..." alt="" coords="801,244,976,271"/>
-<area shape="rect" id="node17" href="$TestMacros_8h.html" title="Various macros (test(), testF(), testing(), testingF(), externTest(), externTestF(), externTesting(), externTestingF()) are defined in this header. " alt="" coords="572,95,707,121"/>
-<area shape="rect" id="node8" href="$FCString_8h_source.html" title="FCString.h" alt="" coords="445,468,530,495"/>
-<area shape="rect" id="node10" href="$Flash_8h.html" title="Various macros to smooth over the differences among the various platforms with regards to their suppo..." alt="" coords="731,393,796,420"/>
+<area shape="rect" id="node2" href="$print64_8h.html" title="Helper routines to print &#39;long long&#39; and &#39;unsigned long long&#39; because the Print::print() methods in P..." alt="" coords="51,95,155,121"/>
+<area shape="rect" id="node5" href="$Verbosity_8h_source.html" title="aunit/Verbosity.h" alt="" coords="858,468,978,495"/>
+<area shape="rect" id="node7" href="$Compare_8h.html" title="This file provides overloaded compareXxx(a, b) functions which are used by the various assertXxx(a..." alt="" coords="141,244,260,271"/>
+<area shape="rect" id="node8" href="$Printer_8h_source.html" title="aunit/Printer.h" alt="" coords="208,319,311,345"/>
+<area shape="rect" id="node9" href="$Test_8h_source.html" title="aunit/Test.h" alt="" coords="1071,393,1162,420"/>
+<area shape="rect" id="node11" href="$Assertion_8h_source.html" title="aunit/Assertion.h" alt="" coords="1057,319,1177,345"/>
+<area shape="rect" id="node13" href="$MetaAssertion_8h_source.html" title="aunit/MetaAssertion.h" alt="" coords="437,244,586,271"/>
+<area shape="rect" id="node14" href="$TestOnce_8h_source.html" title="aunit/TestOnce.h" alt="" coords="351,169,474,196"/>
+<area shape="rect" id="node15" href="$TestAgain_8h_source.html" title="aunit/TestAgain.h" alt="" coords="549,169,673,196"/>
+<area shape="rect" id="node16" href="$TestRunner_8h_source.html" title="aunit/TestRunner.h" alt="" coords="1346,319,1479,345"/>
+<area shape="rect" id="node17" href="$AssertVerboseMacros_8h.html" title="Verbose versions of the macros in AssertMacros.h. " alt="" coords="1103,95,1298,121"/>
+<area shape="rect" id="node18" href="$MetaAssertMacros_8h.html" title="Various assertTestXxx(), checkTestXxx(), assertTestXxxF() and checkTestXxxF() macros are defined in t..." alt="" coords="1003,244,1177,271"/>
+<area shape="rect" id="node19" href="$TestMacros_8h.html" title="Various macros (test(), testF(), testing(), testingF(), externTest(), externTestF(), externTesting(), externTestingF()) are defined in this header. " alt="" coords="683,95,817,121"/>
+<area shape="rect" id="node10" href="$FCString_8h_source.html" title="FCString.h" alt="" coords="581,468,666,495"/>
+<area shape="rect" id="node12" href="$Flash_8h.html" title="Various macros to smooth over the differences among the various platforms with regards to their suppo..." alt="" coords="981,393,1047,420"/>
 </map>

docs/html/AUnitVerbose_8h__incl.md5

@@ -1 +1 @@
-532d6c15294b5e9fe7e5c453d04d9b25
+47a15b7e98586a9ab2960946b35b7c72