Improved tests (and fixed a bug in the tests); thanks to Richard Smith for the suggestion

llvm-svn: 186022

1 files changed, 13 insertions, 2 deletions

diff --git a/libcxx/test/utilities/utility/exchange/exchange.pass.cpp b/libcxx/test/utilities/utility/exchange/exchange.pass.cpp
index f8b366ac209..620b4149d1d 100644
--- a/libcxx/test/utilities/utility/exchange/exchange.pass.cpp
+++ b/libcxx/test/utilities/utility/exchange/exchange.pass.cpp
@@ -23,7 +23,11 @@ int main()
     assert ( std::exchange ( v, 23 ) == 12 );
     assert ( v == 23 );
     assert ( std::exchange ( v, 67.2 ) == 23 );
-    assert ( v = 67 );
+    assert ( v == 67 );
+
+    assert ((std::exchange<int, float> ( v, {} )) == 67 );
+    assert ( v == 0 );
+    
     }
 
     {
@@ -40,8 +44,15 @@ int main()
     assert ( s3 == s2 );
     assert ( std::exchange ( s3, "Hi Mom!" ) == s2 );
     assert ( s3 == s1 );
-    assert ( std::exchange ( s3, "" ) == s1 );
+
+    s3 = s2; // Dad
+    assert ( std::exchange ( s3, {} ) == s2 );
+    assert ( s3.size () == 0 );
+    
+    s3 = s2; // Dad
+    assert ( std::exchange ( s3, "" ) == s2 );
     assert ( s3.size () == 0 );
     }
+
 #endif
 }