diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-16 19:47:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-10-16 19:47:08 +0000 |
commit | 3dc92c36aa6f58a2ce2f57089501364dab6a44bc (patch) | |
tree | d48b2ca1cee14621dd7c51e3a6ba089ca18e43fe /vespalib/src/tests/alloc/alloc_test.cpp | |
parent | 1ab845031009400d8222f2c4affffaeaba3ccd71 (diff) |
Remove the XXXFactory indirection. Just use static method on Alloc.
Diffstat (limited to 'vespalib/src/tests/alloc/alloc_test.cpp')
-rw-r--r-- | vespalib/src/tests/alloc/alloc_test.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vespalib/src/tests/alloc/alloc_test.cpp b/vespalib/src/tests/alloc/alloc_test.cpp index c0f732cf9da..8a1049f2784 100644 --- a/vespalib/src/tests/alloc/alloc_test.cpp +++ b/vespalib/src/tests/alloc/alloc_test.cpp @@ -48,13 +48,13 @@ void Test::testBasic() { { - Alloc h = HeapAllocFactory::create(100); + Alloc h = Alloc::allocHeap(100); EXPECT_EQUAL(100u, h.size()); EXPECT_TRUE(h.get() != nullptr); } { - EXPECT_EXCEPTION(AlignedHeapAllocFactory::create(100, 7), IllegalArgumentException, "AlignedHeapAllocFactory::create(100, 7) does not support 7 alignment"); - Alloc h = AlignedHeapAllocFactory::create(100, 1024); + EXPECT_EXCEPTION(Alloc::allocAlignedHeap(100, 7), IllegalArgumentException, "Alloc::allocAlignedHeapAlloc(100, 7) does not support 7 alignment"); + Alloc h = Alloc::allocAlignedHeapAlloc(100, 1024); EXPECT_EQUAL(100u, h.size()); EXPECT_TRUE(h.get() != nullptr); } @@ -64,7 +64,7 @@ Test::testBasic() EXPECT_TRUE(h.get() != nullptr); } { - Alloc a = HeapAllocFactory::create(100), b = HeapAllocFactory::create(200); + Alloc a = Alloc::allocHeap(100), b = Alloc::allocHeap(200); testSwap(a, b); } { @@ -72,17 +72,17 @@ Test::testBasic() testSwap(a, b); } { - Alloc a = AlignedHeapAllocFactory::create(100, 1024), b = AlignedHeapAllocFactory::create(200, 1024); + Alloc a = Alloc::allocAlignedHeap(100, 1024), b = Alloc::allocAlignedHeap(200, 1024); testSwap(a, b); } { - Alloc a = HeapAllocFactory::create(100); + Alloc a = Alloc::allocHeap(100); Alloc b = MMapAllocFactory::create(200); testSwap(a, b); } { - Alloc a = HeapAllocFactory::create(100); - Alloc b = HeapAllocFactory::create(100); + Alloc a = Alloc::allocHeap(100); + Alloc b = Alloc::allocHeap(100); a = std::move(b); EXPECT_TRUE(b.get() == nullptr); } |