Sep 1, 2023 · Sep 1, 2023 · Sep 2, 2023 · Sep 2, 2023 · Sep 2, 2023 · Sep 4, 2023
diff --git a/api/String.cpp b/api/String.cpp
 String & String::operator = (const String &rhs)
 {
 if (this == &rhs) return *this;


 if (rhs.buffer) copy(rhs.buffer, rhs.len);
 else invalidate();


 return *this;
 }

 {
 if (cstr) copy(cstr, strlen(cstr));
 else invalidate();


 return *this;
 }

 const char *p2 = s2.buffer;
 while (*p1) {
 if (tolower(*p1++) != tolower(*p2++)) return false;
 }
 }
 return true;
 }

 return operator[](loc);
 }

 void String::setCharAt(unsigned int loc, char c)
 void String::setCharAt(unsigned int loc, char c)
 {
 if (loc < len) buffer[loc] = c;
 }
 /*  Modification                             */
 /*********************************************/

 void String::insert(const String &str, unsigned int index, unsigned int length)
 {
    if (index > len) return;
    length = length < str.len ? length : str.len;
    unsigned int size = len + length;
    if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
    memmove(buffer + index + length, buffer + index, len - index + length);
    memcpy(buffer + index, str.buffer, length);
    len += length;
    return;
 }

 void String::replace(char find, char replace)
 {
 if (!buffer) return;
diff --git a/api/String.h b/api/String.h
 String substring( unsigned int beginIndex, unsigned int endIndex ) const;

 // modification
 void replace(char find, char replace);
 void insert(char c, unsigned int index) { return insert(&c, index, 1); };
    void insert(const String &str, unsigned int index, unsigned int length);
    void replace(char find, char replace);
 void replace(const String& find, const String& replace);
 void remove(unsigned int index);
 void remove(unsigned int index, unsigned int count);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
  src/String/test_indexOf.cpp
  src/String/test_lastIndexOf.cpp
  src/String/test_length.cpp
  src/String/test_insert.cpp
  src/String/test_move.cpp
  src/String/test_remove.cpp
  src/String/test_replace.cpp
diff --git a/test/src/String/test_insert.cpp b/test/src/String/test_insert.cpp
 /*
 * Copyright (c) 2023 Arduino.  All rights reserved.
 */

 /**************************************************************************************
 * INCLUDE
 **************************************************************************************/

 #include <catch.hpp>

 #include <String.h>

 #include "StringPrinter.h"

 /**************************************************************************************
 * TEST CODE
 **************************************************************************************/

 TEST_CASE ("Testing String::insert(char, index)", "[String-insert-01]")
 {
  arduino::String str = "ello";
  str.insert('h', 0);
  REQUIRE(str == String("hello"));
 }

 TEST_CASE ("Testing String::insert(char, index) with index > length", "[String-insert-02]")
 {
  arduino::String str = "Hello Arduino";
  str.insert('!', str.length() + 1);
  REQUIRE(str == String("Hello Arduino"));
 }


 TEST_CASE ("Testing String::insert(String, index, length) with length >= inserted length", "[String-insert-03]")
 {
    arduino::String str = "hello ";
    str.insert("world", str.length(), 5);
    REQUIRE(str == String("hello world"));
 }

 TEST_CASE ("Testing String::insert(String, index, length) with length < inserted length", "[String-insert-04]")
 {
    arduino::String str = "Hello ";
    str.insert("Arduino 1234", str.length(), 7);
    REQUIRE(str == String("Hello Arduino"));
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -234,10 +234,10 @@ void String::move(String &rhs)
		String & String::operator = (const String &rhs)
		{
		if (this == &rhs) return *this;


		if (rhs.buffer) copy(rhs.buffer, rhs.len);
		else invalidate();


		return *this;
		}

Expand All		@@ -253,7 +253,7 @@ String & String::operator = (const char *cstr)
		{
		if (cstr) copy(cstr, strlen(cstr));
		else invalidate();


		return *this;
		}

Expand DownExpand Up		@@ -484,7 +484,7 @@ bool String::equalsIgnoreCase( const String &s2 ) const
		const char *p2 = s2.buffer;
		while (*p1) {
		if (tolower(p1++) != tolower(p2++)) return false;
		}
		}
		return true;
		}

Expand DownExpand Up		@@ -515,7 +515,7 @@ char String::charAt(unsigned int loc) const
		return operator[](loc);
		}

		void String::setCharAt(unsigned int loc, char c)
		void String::setCharAt(unsigned int loc, char c)
		{
		if (loc < len) buffer[loc] = c;
		}
Expand DownExpand Up		@@ -631,6 +631,18 @@ String String::substring(unsigned int left, unsigned int right) const
		/* Modification */
		/*********************************************/

		void String::insert(const String &str, unsigned int index, unsigned int length)
		{
		if (index > len) return;
		length = length < str.len ? length : str.len;
		unsigned int size = len + length;
		if (size > capacity && !changeBuffer(size)) return; // XXX: tell user!
		memmove(buffer + index + length, buffer + index, len - index + length);
		memcpy(buffer + index, str.buffer, length);
		len += length;
		return;
		}

		void String::replace(char find, char replace)
		{
		if (!buffer) return;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -206,7 +206,9 @@ class String
		String substring( unsigned int beginIndex, unsigned int endIndex ) const;

		// modification
		void replace(char find, char replace);
		void insert(char c, unsigned int index) { return insert(&c, index, 1); };
		void insert(const String &str, unsigned int index, unsigned int length);
		void replace(char find, char replace);
		void replace(const String& find, const String& replace);
		void remove(unsigned int index);
		void remove(unsigned int index, unsigned int count);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,6 +72,7 @@ set(TEST_SRCS
		src/String/test_indexOf.cpp
		src/String/test_lastIndexOf.cpp
		src/String/test_length.cpp
		src/String/test_insert.cpp
		src/String/test_move.cpp
		src/String/test_remove.cpp
		src/String/test_replace.cpp
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,47 @@
		/*
		* Copyright (c) 2023 Arduino. All rights reserved.
		*/

		/**************************************************************************************
		* INCLUDE
		**************************************************************************************/

		#include <catch.hpp>

		#include <String.h>

		#include "StringPrinter.h"

		/**************************************************************************************
		* TEST CODE
		**************************************************************************************/

		TEST_CASE ("Testing String::insert(char, index)", "[String-insert-01]")
		{
		arduino::String str = "ello";
		str.insert('h', 0);
		REQUIRE(str == String("hello"));
		}

		TEST_CASE ("Testing String::insert(char, index) with index > length", "[String-insert-02]")
		{
		arduino::String str = "Hello Arduino";
		str.insert('!', str.length() + 1);
		REQUIRE(str == String("Hello Arduino"));
		}


		TEST_CASE ("Testing String::insert(String, index, length) with length >= inserted length", "[String-insert-03]")
		{
		arduino::String str = "hello ";
		str.insert("world", str.length(), 5);
		REQUIRE(str == String("hello world"));
		}

		TEST_CASE ("Testing String::insert(String, index, length) with length < inserted length", "[String-insert-04]")
		{
		arduino::String str = "Hello ";
		str.insert("Arduino 1234", str.length(), 7);
		REQUIRE(str == String("Hello Arduino"));
		}