| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 TEST(HashSetTest, HashSetOwnPtr) { | 88 TEST(HashSetTest, HashSetOwnPtr) { |
| 89 bool deleted1 = false, deleted2 = false; | 89 bool deleted1 = false, deleted2 = false; |
| 90 | 90 |
| 91 typedef HashSet<std::unique_ptr<Dummy>> OwnPtrSet; | 91 typedef HashSet<std::unique_ptr<Dummy>> OwnPtrSet; |
| 92 OwnPtrSet set; | 92 OwnPtrSet set; |
| 93 | 93 |
| 94 Dummy* ptr1 = new Dummy(deleted1); | 94 Dummy* ptr1 = new Dummy(deleted1); |
| 95 { | 95 { |
| 96 // AddResult in a separate scope to avoid assertion hit, | 96 // AddResult in a separate scope to avoid assertion hit, |
| 97 // since we modify the container further. | 97 // since we modify the container further. |
| 98 HashSet<std::unique_ptr<Dummy>>::AddResult res1 = set.add(wrapUnique(ptr1)); | 98 HashSet<std::unique_ptr<Dummy>>::AddResult res1 = |
| 99 set.add(WTF::wrapUnique(ptr1)); |
| 99 EXPECT_EQ(ptr1, res1.storedValue->get()); | 100 EXPECT_EQ(ptr1, res1.storedValue->get()); |
| 100 } | 101 } |
| 101 | 102 |
| 102 EXPECT_FALSE(deleted1); | 103 EXPECT_FALSE(deleted1); |
| 103 EXPECT_EQ(1UL, set.size()); | 104 EXPECT_EQ(1UL, set.size()); |
| 104 OwnPtrSet::iterator it1 = set.find(ptr1); | 105 OwnPtrSet::iterator it1 = set.find(ptr1); |
| 105 EXPECT_NE(set.end(), it1); | 106 EXPECT_NE(set.end(), it1); |
| 106 EXPECT_EQ(ptr1, (*it1).get()); | 107 EXPECT_EQ(ptr1, (*it1).get()); |
| 107 | 108 |
| 108 Dummy* ptr2 = new Dummy(deleted2); | 109 Dummy* ptr2 = new Dummy(deleted2); |
| 109 { | 110 { |
| 110 HashSet<std::unique_ptr<Dummy>>::AddResult res2 = set.add(wrapUnique(ptr2)); | 111 HashSet<std::unique_ptr<Dummy>>::AddResult res2 = |
| 112 set.add(WTF::wrapUnique(ptr2)); |
| 111 EXPECT_EQ(res2.storedValue->get(), ptr2); | 113 EXPECT_EQ(res2.storedValue->get(), ptr2); |
| 112 } | 114 } |
| 113 | 115 |
| 114 EXPECT_FALSE(deleted2); | 116 EXPECT_FALSE(deleted2); |
| 115 EXPECT_EQ(2UL, set.size()); | 117 EXPECT_EQ(2UL, set.size()); |
| 116 OwnPtrSet::iterator it2 = set.find(ptr2); | 118 OwnPtrSet::iterator it2 = set.find(ptr2); |
| 117 EXPECT_NE(set.end(), it2); | 119 EXPECT_NE(set.end(), it2); |
| 118 EXPECT_EQ(ptr2, (*it2).get()); | 120 EXPECT_EQ(ptr2, (*it2).get()); |
| 119 | 121 |
| 120 set.remove(ptr1); | 122 set.remove(ptr1); |
| 121 EXPECT_TRUE(deleted1); | 123 EXPECT_TRUE(deleted1); |
| 122 | 124 |
| 123 set.clear(); | 125 set.clear(); |
| 124 EXPECT_TRUE(deleted2); | 126 EXPECT_TRUE(deleted2); |
| 125 EXPECT_TRUE(set.isEmpty()); | 127 EXPECT_TRUE(set.isEmpty()); |
| 126 | 128 |
| 127 deleted1 = false; | 129 deleted1 = false; |
| 128 deleted2 = false; | 130 deleted2 = false; |
| 129 { | 131 { |
| 130 OwnPtrSet set; | 132 OwnPtrSet set; |
| 131 set.add(makeUnique<Dummy>(deleted1)); | 133 set.add(WTF::makeUnique<Dummy>(deleted1)); |
| 132 set.add(makeUnique<Dummy>(deleted2)); | 134 set.add(WTF::makeUnique<Dummy>(deleted2)); |
| 133 } | 135 } |
| 134 EXPECT_TRUE(deleted1); | 136 EXPECT_TRUE(deleted1); |
| 135 EXPECT_TRUE(deleted2); | 137 EXPECT_TRUE(deleted2); |
| 136 | 138 |
| 137 deleted1 = false; | 139 deleted1 = false; |
| 138 deleted2 = false; | 140 deleted2 = false; |
| 139 std::unique_ptr<Dummy> ownPtr1; | 141 std::unique_ptr<Dummy> ownPtr1; |
| 140 std::unique_ptr<Dummy> ownPtr2; | 142 std::unique_ptr<Dummy> ownPtr2; |
| 141 ptr1 = new Dummy(deleted1); | 143 ptr1 = new Dummy(deleted1); |
| 142 ptr2 = new Dummy(deleted2); | 144 ptr2 = new Dummy(deleted2); |
| 143 { | 145 { |
| 144 OwnPtrSet set; | 146 OwnPtrSet set; |
| 145 set.add(wrapUnique(ptr1)); | 147 set.add(WTF::wrapUnique(ptr1)); |
| 146 set.add(wrapUnique(ptr2)); | 148 set.add(WTF::wrapUnique(ptr2)); |
| 147 ownPtr1 = set.take(ptr1); | 149 ownPtr1 = set.take(ptr1); |
| 148 EXPECT_EQ(1UL, set.size()); | 150 EXPECT_EQ(1UL, set.size()); |
| 149 ownPtr2 = set.takeAny(); | 151 ownPtr2 = set.takeAny(); |
| 150 EXPECT_TRUE(set.isEmpty()); | 152 EXPECT_TRUE(set.isEmpty()); |
| 151 } | 153 } |
| 152 EXPECT_FALSE(deleted1); | 154 EXPECT_FALSE(deleted1); |
| 153 EXPECT_FALSE(deleted2); | 155 EXPECT_FALSE(deleted2); |
| 154 | 156 |
| 155 EXPECT_EQ(ptr1, ownPtr1.get()); | 157 EXPECT_EQ(ptr1, ownPtr1.get()); |
| 156 EXPECT_EQ(ptr2, ownPtr2.get()); | 158 EXPECT_EQ(ptr2, ownPtr2.get()); |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 | 499 |
| 498 // Other ways of construction: as a function parameter and in a return | 500 // Other ways of construction: as a function parameter and in a return |
| 499 // statement. | 501 // statement. |
| 500 EXPECT_TRUE(isOneTwoThree({1, 2, 3})); | 502 EXPECT_TRUE(isOneTwoThree({1, 2, 3})); |
| 501 EXPECT_TRUE(isOneTwoThree(returnOneTwoThree())); | 503 EXPECT_TRUE(isOneTwoThree(returnOneTwoThree())); |
| 502 } | 504 } |
| 503 | 505 |
| 504 } // anonymous namespace | 506 } // anonymous namespace |
| 505 | 507 |
| 506 } // namespace WTF | 508 } // namespace WTF |
| OLD | NEW |