Rebased approvals

projects/SelfTest/Baselines/compact.sw.approved.txt

@@ -991,7 +991,6 @@ String.tests.cpp:<line number>: passed: isOwned( s ) == false for: false == fals
 String.tests.cpp:<line number>: passed: original == "original"
 String.tests.cpp:<line number>: passed: isSubstring( original ) for: true
 String.tests.cpp:<line number>: passed: isOwned( original ) == false for: false == false
-String.tests.cpp:<line number>: passed: isSubstring( original ) == false for: false == false
 String.tests.cpp:<line number>: passed: isOwned( original ) for: true
 String.tests.cpp:<line number>: passed: ss.empty() == false for: false == false
 String.tests.cpp:<line number>: passed: ss.size() == 5 for: 5 == 5
@@ -1001,10 +1000,10 @@ String.tests.cpp:<line number>: passed: isSubstring( ss ) for: true
 String.tests.cpp:<line number>: passed: isOwned( ss ) == false for: false == false
 String.tests.cpp:<line number>: passed: rawChars == s.currentData() for: "hello world!" == "hello world!"
 String.tests.cpp:<line number>: passed: ss.c_str() != rawChars for: "hello" != "hello world!"
-String.tests.cpp:<line number>: passed: isSubstring( ss ) == false for: false == false
 String.tests.cpp:<line number>: passed: isOwned( ss ) for: true
-String.tests.cpp:<line number>: passed: ss.currentData() != s.currentData() for: "hello" != "hello world!"
+String.tests.cpp:<line number>: passed: isOwned(ss) == false for: false == false
-String.tests.cpp:<line number>: passed: isOwned(ss) == true for: true == true
+String.tests.cpp:<line number>: passed: ss == "hello" for: hello == "hello"
+String.tests.cpp:<line number>: passed: rawChars == ss.currentData() for: "hello world!" == "hello world!"
 String.tests.cpp:<line number>: passed: ss.size() == 6 for: 6 == 6
 String.tests.cpp:<line number>: passed: std::strcmp( ss.c_str(), "world!" ) == 0 for: 0 == 0
 String.tests.cpp:<line number>: passed: s.c_str() == s2.c_str() for: "hello world!" == "hello world!"

projects/SelfTest/Baselines/console.std.approved.txt

@@ -1300,5 +1300,5 @@ due to unexpected exception with message:
 
 ===============================================================================
 test cases:  267 |  200 passed |  63 failed |  4 failed as expected
-assertions: 1454 | 1309 passed | 124 failed | 21 failed as expected
+assertions: 1453 | 1308 passed | 124 failed | 21 failed as expected
 

projects/SelfTest/Baselines/console.sw.approved.txt

@@ -7286,11 +7286,6 @@ String.tests.cpp:<line number>: PASSED:
 with expansion:
   false == false
 
-String.tests.cpp:<line number>: PASSED:
-  REQUIRE( isSubstring( original ) == false )
-with expansion:
-  false == false
-
 String.tests.cpp:<line number>: PASSED:
   REQUIRE( isOwned( original ) )
 with expansion:
@@ -7352,21 +7347,11 @@ String.tests.cpp:<line number>: PASSED:
 with expansion:
   "hello" != "hello world!"
 
-String.tests.cpp:<line number>: PASSED:
-  REQUIRE( isSubstring( ss ) == false )
-with expansion:
-  false == false
-
 String.tests.cpp:<line number>: PASSED:
   REQUIRE( isOwned( ss ) )
 with expansion:
   true
 
-String.tests.cpp:<line number>: PASSED:
-  REQUIRE( ss.currentData() != s.currentData() )
-with expansion:
-  "hello" != "hello world!"
-
 -------------------------------------------------------------------------------
 StringRef
   Substrings
@@ -7377,9 +7362,19 @@ String.tests.cpp:<line number>
 ...............................................................................
 
 String.tests.cpp:<line number>: PASSED:
-  REQUIRE( isOwned(ss) == true )
+  REQUIRE( isOwned(ss) == false )
 with expansion:
-  true == true
+  false == false
+
+String.tests.cpp:<line number>: PASSED:
+  REQUIRE( ss == "hello" )
+with expansion:
+  hello == "hello"
+
+String.tests.cpp:<line number>: PASSED:
+  REQUIRE( rawChars == ss.currentData() )
+with expansion:
+  "hello world!" == "hello world!"
 
 -------------------------------------------------------------------------------
 StringRef
@@ -11438,5 +11433,5 @@ Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
 test cases:  267 |  184 passed |  79 failed |  4 failed as expected
-assertions: 1471 | 1309 passed | 141 failed | 21 failed as expected
+assertions: 1470 | 1308 passed | 141 failed | 21 failed as expected
 

projects/SelfTest/Baselines/junit.sw.approved.txt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="17" failures="125" tests="1472" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="125" tests="1471" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals]"/>
       <property name="random-seed" value="1"/>

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -9065,14 +9065,6 @@ Message from section two
             false == false
           </Expanded>
         </Expression>
-        <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
-          <Original>
-            isSubstring( original ) == false
-          </Original>
-          <Expanded>
-            false == false
-          </Expanded>
-        </Expression>
         <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
           <Original>
             isOwned( original )
@@ -9081,7 +9073,7 @@ Message from section two
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0" expectedFailures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Substrings" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
         <Section name="zero-based substring" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
@@ -9155,14 +9147,6 @@ Message from section two
               "hello" != "hello world!"
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
-            <Original>
-              isSubstring( ss ) == false
-            </Original>
-            <Expanded>
-              false == false
-            </Expanded>
-          </Expression>
           <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Original>
               isOwned( ss )
@@ -9171,24 +9155,32 @@ Message from section two
               true
             </Expanded>
           </Expression>
-          <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
-            <Original>
-              ss.currentData() != s.currentData()
-            </Original>
-            <Expanded>
-              "hello" != "hello world!"
-            </Expanded>
-          </Expression>
           <Section name="Self-assignment after substring" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
             <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
               <Original>
-                isOwned(ss) == true
+                isOwned(ss) == false
               </Original>
               <Expanded>
-                true == true
+                false == false
               </Expanded>
             </Expression>
-            <OverallResults successes="1" failures="0" expectedFailures="0"/>
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+              <Original>
+                ss == "hello"
+              </Original>
+              <Expanded>
+                hello == "hello"
+              </Expanded>
+            </Expression>
+            <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
+              <Original>
+                rawChars == ss.currentData()
+              </Original>
+              <Expanded>
+                "hello world!" == "hello world!"
+              </Expanded>
+            </Expression>
+            <OverallResults successes="3" failures="0" expectedFailures="0"/>
           </Section>
           <OverallResults successes="8" failures="0" expectedFailures="0"/>
         </Section>
@@ -13780,7 +13772,7 @@ loose text artifact
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="1309" failures="142" expectedFailures="21"/>
+    <OverallResults successes="1308" failures="142" expectedFailures="21"/>
   </Group>
-  <OverallResults successes="1309" failures="141" expectedFailures="21"/>
+  <OverallResults successes="1308" failures="141" expectedFailures="21"/>
 </Catch>