[tool] fix the String tests

mydeveloperday · mydeveloperday · commit 5f2a04f3d64c · 2015-12-02T22:12:37.000Z
diff --git a/src/examples/FileIo/CMakeLists.txt b/src/examples/FileIo/CMakeLists.txt
@@ -4,5 +4,4 @@ include_directories(../../framework)
 
 add_executable(FileIo main.cxx driver.cxx)
 
-# target_include_directories (cpp-net-framework PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries (cpp-net-framework)
diff --git a/src/examples/GTest2Html/CMakeLists.txt b/src/examples/GTest2Html/CMakeLists.txt
@@ -1,10 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
 
-#get_cmake_property(_variableNames VARIABLES)
-#foreach (_variableName ${_variableNames})
-#    message(STATUS "${_variableName}=${${_variableName}}")
-#endforeach()
-
 include_directories(../../framework)
 
 add_executable(GTest2Html 
@@ -17,5 +12,4 @@ set (DEST ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE_INIT})
 			  
 file(COPY gtest_out.txt DESTINATION ${DEST})
 
-# target_include_directories (cpp-net-framework PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries (cpp-net-framework)
diff --git a/src/examples/HelloWorld/CMakeLists.txt b/src/examples/HelloWorld/CMakeLists.txt
@@ -4,5 +4,4 @@ include_directories(../../framework)
 
 add_executable(HelloWorld main.cxx driver.cxx)
 
-# target_include_directories (cpp-net-framework PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries (cpp-net-framework)
diff --git a/src/framework/NetString.h b/src/framework/NetString.h
@@ -160,70 +160,70 @@ namespace System
 
         bool StartsWith(const String& s) const
         {
-            if (String::IsNullOrEmpty(s)){
+            if (String::IsNullOrEmpty(s)) {
                 return false;
             }
-            return (IndexOf(s)==0);
+            return (IndexOf(s) == 0);
         }
 
         bool EndsWith(const String& s) const
         {
-            if (String::IsNullOrEmpty(s)){
+            if (String::IsNullOrEmpty(s)) {
                 return false;
             }
-            return (IndexOf(s)==Length()-s.Length());
+            return (IndexOf(s) == Length() - s.Length());
         }
 
         String Replace(const String& from, const String& with)
         {
-            int pos=IndexOf(from);
-            if (pos==-1){
+            int pos = IndexOf(from);
+            if (pos == -1) {
                 return (*this);
             }
 
-            String newstring=(*this);
-           
-            int maxCount=10; 
-            while (pos!=-1 && maxCount--){
-               newstring.m_str.replace(pos,pos+from.Length(),with.str());
-            
-               int lastpos = pos;
-               pos=newstring.IndexOf(from);
-
-               // try to prevent it going infinite
-               if (pos < lastpos){
-                    break;
-               }
-            }
+            String newstring = (*this);
+
+            //int maxCount=10; 
+            //while (pos!=-1 && maxCount--){
+            newstring.m_str.replace(pos, pos + from.Length(), with.str());
+
+            //int lastpos = pos;
+            //pos=newstring.IndexOf(from);
+
+            // try to prevent it going infinite
+            //if (pos < lastpos){
+            //     break;
+            //}
+         //}
 
             return newstring;
         }
 
         String Trim() const
         {
-           String s=(*this);
-           s=s.TrimEnd(); 
-           s=s.TrimStart(); 
-           return s;
+            String s = (*this);
+            s = s.TrimEnd();
+            s = s.TrimStart();
+            return s;
         }
 
         String TrimEnd() const
         {
-           String s=(*this);
-           s.m_str.erase(s.m_str.find_last_not_of(" \n\r\t")+1); 
-           return s;
+            String s = (*this);
+            s.m_str.erase(s.m_str.find_last_not_of(" \n\r\t") + 1);
+            return s;
         }
 
         String TrimStart() const
         {
-           String s=(*this);
-           s.m_str.erase(s.m_str.find_first_not_of(" \n\r\t")+1); 
-           return s;
+            String s = (*this);
+            s = s.Substring(s.m_str.find_first_not_of(" \n\r\t"));
+            return s;
         }
 
         static bool IsNullOrEmpty(const String &s)
         {
-           return (s.Length()==0);
+            return (s.Length() == 0);
         }
     };
 
@@ -250,6 +250,8 @@ namespace System
     {
         return (a.str() != b.str());
     }
+
+    // void PrintTo(const System::String& str, ::std::ostream* os);
 }
 
 typedef System::String string;
diff --git a/src/framework/System.cxx b/src/framework/System.cxx
@@ -1,2 +1,6 @@
 
 #include "System.h"
+
+//void System::PrintTo(const System::String& str, ::std::ostream* os) {
+//   *os << str.str().c_str();
+//}
diff --git a/src/unittests/String_Test.cxx b/src/unittests/String_Test.cxx
@@ -127,11 +127,11 @@ TEST(StringTest, Trim)
     EXPECT_EQ(String("Hello"),String("   Hello   ").Trim());
 
     EXPECT_EQ(String("Hello"),String("  Hello").TrimStart());
-    EXPECT_EQ(String("Hello   "),String("Hello  ").TrimStart());
+    EXPECT_EQ(String("Hello  "),String("Hello  ").TrimStart());
     EXPECT_EQ(String("Hello"),String("Hello").TrimStart());
     EXPECT_EQ(String("Hello   "),String("   Hello   ").TrimStart());
 
-    EXPECT_EQ(String("   Hello"),String("  Hello").TrimEnd());
+    EXPECT_EQ(String("  Hello"),String("  Hello").TrimEnd());
     EXPECT_EQ(String("Hello"),String("Hello  ").TrimEnd());
     EXPECT_EQ(String("Hello"),String("Hello").TrimEnd());
     EXPECT_EQ(String("   Hello"),String("   Hello   ").TrimEnd());

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,4 @@ include_directories(../../framework)`
`4`	`4`
`5`	`5`	`add_executable(FileIo main.cxx driver.cxx)`
`6`	`6`
`7`		`-# target_include_directories (cpp-net-framework PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})`
`8`	`7`	`target_link_libraries (cpp-net-framework)`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,4 @@ include_directories(../../framework)`
`4`	`4`
`5`	`5`	`add_executable(HelloWorld main.cxx driver.cxx)`
`6`	`6`
`7`		`-# target_include_directories (cpp-net-framework PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})`
`8`	`7`	`target_link_libraries (cpp-net-framework)`
Original file line number	Diff line number	Diff line change
`@@ -160,70 +160,70 @@ namespace System`
`160`	`160`
`161`	`161`	`bool StartsWith(const String& s) const`
`162`	`162`	`{`
`163`		`- if (String::IsNullOrEmpty(s)){`
	`163`	`+ if (String::IsNullOrEmpty(s)) {`
`164`	`164`	`return false;`
`165`	`165`	`}`
`166`		`- return (IndexOf(s)==0);`
	`166`	`+ return (IndexOf(s) == 0);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`bool EndsWith(const String& s) const`
`170`	`170`	`{`
`171`		`- if (String::IsNullOrEmpty(s)){`
	`171`	`+ if (String::IsNullOrEmpty(s)) {`
`172`	`172`	`return false;`
`173`	`173`	`}`
`174`		`- return (IndexOf(s)==Length()-s.Length());`
	`174`	`+ return (IndexOf(s) == Length() - s.Length());`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`String Replace(const String& from, const String& with)`
`178`	`178`	`{`
`179`		`- int pos=IndexOf(from);`
`180`		`- if (pos==-1){`
	`179`	`+ int pos = IndexOf(from);`
	`180`	`+ if (pos == -1) {`
`181`	`181`	`return (*this);`
`182`	`182`	`}`
`183`	`183`
`184`		`- String newstring=(*this);`
`185`		`-`
`186`		`- int maxCount=10;`
`187`		`- while (pos!=-1 && maxCount--){`
`188`		`- newstring.m_str.replace(pos,pos+from.Length(),with.str());`
`189`		`-`
`190`		`- int lastpos = pos;`
`191`		`- pos=newstring.IndexOf(from);`
`192`		`-`
`193`		`- // try to prevent it going infinite`
`194`		`- if (pos < lastpos){`
`195`		`- break;`
`196`		`- }`
`197`		`- }`
	`184`	`+ String newstring = (*this);`
	`185`	`+`
	`186`	`+ //int maxCount=10;`
	`187`	`+ //while (pos!=-1 && maxCount--){`
	`188`	`+ newstring.m_str.replace(pos, pos + from.Length(), with.str());`
	`189`	`+`
	`190`	`+ //int lastpos = pos;`
	`191`	`+ //pos=newstring.IndexOf(from);`
	`192`	`+`
	`193`	`+ // try to prevent it going infinite`
	`194`	`+ //if (pos < lastpos){`
	`195`	`+ // break;`
	`196`	`+ //}`
	`197`	`+ //}`
`198`	`198`
`199`	`199`	`return newstring;`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`String Trim() const`
`203`	`203`	`{`
`204`		`- String s=(*this);`
`205`		`- s=s.TrimEnd();`
`206`		`- s=s.TrimStart();`
`207`		`- return s;`
	`204`	`+ String s = (*this);`
	`205`	`+ s = s.TrimEnd();`
	`206`	`+ s = s.TrimStart();`
	`207`	`+ return s;`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`String TrimEnd() const`
`211`	`211`	`{`
`212`		`- String s=(*this);`
`213`		`- s.m_str.erase(s.m_str.find_last_not_of(" \n\r\t")+1);`
`214`		`- return s;`
	`212`	`+ String s = (*this);`
	`213`	`+ s.m_str.erase(s.m_str.find_last_not_of(" \n\r\t") + 1);`
	`214`	`+ return s;`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`String TrimStart() const`
`218`	`218`	`{`
`219`		`- String s=(*this);`
`220`		`- s.m_str.erase(s.m_str.find_first_not_of(" \n\r\t")+1);`
`221`		`- return s;`
	`219`	`+ String s = (*this);`
	`220`	`+ s = s.Substring(s.m_str.find_first_not_of(" \n\r\t"));`
	`221`	`+ return s;`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`static bool IsNullOrEmpty(const String &s)`
`225`	`225`	`{`
`226`		`- return (s.Length()==0);`
	`226`	`+ return (s.Length() == 0);`
`227`	`227`	`}`
`228`	`228`	`};`
`229`	`229`
`@@ -250,6 +250,8 @@ namespace System`
`250`	`250`	`{`
`251`	`251`	`return (a.str() != b.str());`
`252`	`252`	`}`
	`253`	`+`
	`254`	`+ // void PrintTo(const System::String& str, ::std::ostream* os);`
`253`	`255`	`}`
`254`	`256`
`255`	`257`	`typedef System::String string;`