arduino · aentinger · Nov 6, 2020 · Sep 8, 2020 · Sep 8, 2020 · Sep 8, 2020
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -0,0 +1,45 @@
+name: Unit Tests
+
+on:
+  pull_request:
+    # Only run workflow if a file in these paths are modified
+    paths:
+      - ".github/workflows/unit-tests.yml"
+      - "test/**"
+      - "api/**"
+
+  push:
+    paths:
+      - ".github/workflows/unit-tests.yml"
+      - "test/**"
+      - "api/**"
+
+jobs:
+  test:
+    name: Run unit tests
+    runs-on: ubuntu-latest
+
+    env:
+      COVERAGE_DATA_PATH: extras/coverage-data/coverage.info
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # See: https://github.com/arduino/cpp-test-action/blob/main/README.md
+      - uses: arduino/cpp-test-action@main
+        with:
+          source-path: test
+          build-path: test/build
+          runtime-path: test/build/bin/test-ArduinoCore-API
+          coverage-exclude-paths: |
+            - '*/test/*'
+            - '/usr/*'
+          coverage-data-path: ${{ env.COVERAGE_DATA_PATH }}
+
+      # See: https://github.com/codecov/codecov-action/blob/master/README.md
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          file: ${{ env.COVERAGE_DATA_PATH }}
+          fail_ci_if_error: true
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # ArduinoCore-API
 
+[![Unit Tests](https://github.com/arduino/ArduinoCore-API/workflows/Unit%20Tests/badge.svg)](https://github.com/arduino/ArduinoCore-API/actions?workflow=Unit+Tests)
+[![codecov](https://codecov.io/gh/arduino/ArduinoCore-API/branch/master/graph/badge.svg)](https://codecov.io/gh/arduino/ArduinoCore-API)
+
 This repository hosts the hardware independent layer of Arduino core.
 
 All Arduino official cores are being ported to the new structure so they take advantage of this single repo.

diff --git a/api/Common.h b/api/Common.h
@@ -79,7 +79,9 @@ typedef uint16_t  word;
 void init(void);
 void initVariant(void);
 
+#ifndef HOST
 int atexit(void (*func)()) __attribute__((weak));
+#endif
 int main() __attribute__((weak));
 
 #ifdef EXTENDED_PIN_MODE

diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp
@@ -49,15 +49,15 @@ bool IPAddress::fromString(const char *address)
 {
     // TODO: add support for "a", "a.b", "a.b.c" formats
 
-    uint16_t acc = 0; // Accumulator
+    int16_t acc = -1; // Accumulator
     uint8_t dots = 0;
 
     while (*address)
     {
         char c = *address++;
         if (c >= '0' && c <= '9')
         {
-            acc = acc * 10 + (c - '0');
+            acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0');
             if (acc > 255) {
                 // Value out of [0..255] range
                 return false;
@@ -69,8 +69,12 @@ bool IPAddress::fromString(const char *address)
                 // Too much dots (there must be 3 dots)
                 return false;
             }
+            if (acc < 0) {
+                /* No value between dots, e.g. '1..' */
+                return false;
+            }
             _address.bytes[dots++] = acc;
-            acc = 0;
+            acc = -1;
         }
         else
         {
@@ -83,6 +87,10 @@ bool IPAddress::fromString(const char *address)
         // Too few dots (there must be 3 dots)
         return false;
     }
+    if (acc < 0) {
+        /* No value between dots, e.g. '1..' */
+        return false;
+    }
     _address.bytes[3] = acc;
     return true;
 }

diff --git a/api/Print.cpp b/api/Print.cpp
@@ -332,8 +332,11 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)
   return bytes;
 }
 
-size_t Print::printFloat(double number, uint8_t digits)
+size_t Print::printFloat(double number, int digits)
 {
+  if (digits < 0)
+    digits = 2;
+
   size_t n = 0;
 
   if (isnan(number)) return print("nan");

diff --git a/api/Print.h b/api/Print.h
@@ -37,7 +37,7 @@ class Print
     int write_error;
     size_t printNumber(unsigned long, uint8_t);
     size_t printULLNumber(unsigned long long, uint8_t);
-    size_t printFloat(double, uint8_t);
+    size_t printFloat(double, int);
   protected:
     void setWriteError(int err = 1) { write_error = err; }
   public:

diff --git a/api/RingBuffer.h b/api/RingBuffer.h
@@ -22,6 +22,7 @@
 #define _RING_BUFFER_
 
 #include <stdint.h>
+#include <string.h>
 
 namespace arduino {
 
@@ -38,6 +39,7 @@ class RingBufferN
     uint8_t _aucBuffer[N] ;
     volatile int _iHead ;
     volatile int _iTail ;
+    volatile int _numElems;
 
   public:
     RingBufferN( void ) ;
@@ -51,6 +53,7 @@ class RingBufferN
 
   private:
     int nextIndex(int index);
+    inline bool isEmpty() const { return (_numElems == 0); }
 };
 
 typedef RingBufferN<SERIAL_BUFFER_SIZE> RingBuffer;
@@ -66,16 +69,15 @@ RingBufferN<N>::RingBufferN( void )
 template <int N>
 void RingBufferN<N>::store_char( uint8_t c )
 {
-  int i = nextIndex(_iHead);
-
   // if we should be storing the received character into the location
   // just before the tail (meaning that the head would advance to the
   // current location of the tail), we're about to overflow the buffer
   // and so we don't write the character or advance the head.
-  if ( i != _iTail )
+  if (!isFull())
   {
     _aucBuffer[_iHead] = c ;
-    _iHead = i ;
+    _iHead = nextIndex(_iHead);
+    _numElems++;
   }
 }
 
@@ -84,44 +86,38 @@ void RingBufferN<N>::clear()
 {
   _iHead = 0;
   _iTail = 0;
+  _numElems = 0;
 }
 
 template <int N>
 int RingBufferN<N>::read_char()
 {
-  if(_iTail == _iHead)
+  if (isEmpty())
     return -1;
 
   uint8_t value = _aucBuffer[_iTail];
   _iTail = nextIndex(_iTail);
+  _numElems--;
 
   return value;
 }
 
 template <int N>
 int RingBufferN<N>::available()
 {
-  int delta = _iHead - _iTail;
-
-  if(delta < 0)
-    return N + delta;
-  else
-    return delta;
+  return _numElems;
 }
 
 template <int N>
 int RingBufferN<N>::availableForStore()
 {
-  if (_iHead >= _iTail)
-    return N - 1 - _iHead + _iTail;
-  else
-    return _iTail - _iHead - 1;
+  return (N - _numElems);
 }
 
 template <int N>
 int RingBufferN<N>::peek()
 {
-  if(_iTail == _iHead)
+  if (isEmpty())
     return -1;
 
   return _aucBuffer[_iTail];
@@ -136,7 +132,7 @@ int RingBufferN<N>::nextIndex(int index)
 template <int N>
 bool RingBufferN<N>::isFull()
 {
-  return (nextIndex(_iHead) == _iTail);
+  return (_numElems == N);
 }
 
 }

diff --git a/api/String.cpp b/api/String.cpp
@@ -646,17 +646,22 @@ void String::replace(const String& find, const String& replace)
 			readFrom = foundAt + replace.len;
 		}
 	} else if (diff < 0) {
-		char *writeTo = buffer;
+		unsigned int size = len; // compute size needed for result
 		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
-			unsigned int n = foundAt - readFrom;
-			memcpy(writeTo, readFrom, n);
-			writeTo += n;
-			memcpy(writeTo, replace.buffer, replace.len);
-			writeTo += replace.len;
 			readFrom = foundAt + find.len;
-			len += diff;
+			diff = 0 - diff;
+			size -= diff;
+		}
+		if (size == len) return;
+		int index = len - 1;
+		while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
+			readFrom = buffer + index + find.len;
+			memmove(readFrom - diff, readFrom, len - (readFrom - buffer));
+			len -= diff;
+			buffer[len] = 0;
+			memcpy(buffer + index, replace.buffer, replace.len);
+			index--;
 		}
-		strcpy(writeTo, readFrom);
 	} else {
 		unsigned int size = len; // compute size needed for result
 		while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {

diff --git a/api/String.h b/api/String.h
@@ -107,7 +107,7 @@ class String
 	unsigned char concat(const String &str);
 	unsigned char concat(const char *cstr);
 	unsigned char concat(char c);
-	unsigned char concat(unsigned char c);
+	unsigned char concat(unsigned char num);
 	unsigned char concat(int num);
 	unsigned char concat(unsigned int num);
 	unsigned char concat(long num);

diff --git a/test/.gitignore b/test/.gitignore
@@ -0,0 +1 @@
+build