Bläddra i källkod

Fixing test-cases for ownership - increasing legibility

Samuel Jaffe 9 år sedan
förälder
incheckning
4eda6d769f
2 ändrade filer med 8 tillägg och 18 borttagningar
  1. 4 9
      maybe_null.t.h
  2. 4 9
      not_null.t.h

+ 4 - 9
maybe_null.t.h

@@ -61,15 +61,10 @@ public:
       ~test_t() { _r = true; }
       bool & _r;
     };
-    {
-      std::shared_ptr<test_t> test_struct{new test_t{has_delete}};
-    
-      TS_ASSERT_EQUALS(test_struct->_r, has_delete);
-      {
-      maybe_null<std::shared_ptr<test_t>> nn(test_struct);
-      }
-      TS_ASSERT_EQUALS(has_delete, false);
-    }
+    test_t * test_struct = new test_t{has_delete};
+    maybe_null<test_t *>{test_struct};
+    TS_ASSERT_EQUALS(has_delete, false);
+    delete test_struct;
     TS_ASSERT_EQUALS(has_delete, true);
   }
   

+ 4 - 9
not_null.t.h

@@ -43,15 +43,10 @@ public:
       ~test_t() { _r = true; }
       bool & _r;
     };
-    {
-      std::shared_ptr<test_t> test_struct{new test_t{has_delete}};
-      
-      TS_ASSERT_EQUALS(test_struct->_r, has_delete);
-      {
-        not_null<std::shared_ptr<test_t>> nn(test_struct);
-      }
-      TS_ASSERT_EQUALS(has_delete, false);
-    }
+    test_t * test_struct = new test_t{has_delete};
+    not_null<test_t *>{test_struct};
+    TS_ASSERT_EQUALS(has_delete, false);
+    delete test_struct;
     TS_ASSERT_EQUALS(has_delete, true);
   }
 };