diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
| commit | 93e5dbed325f29c1bf867a2847d3b839d545cfb2 (patch) | |
| tree | f657b55b41a05cf364403a36edf9d0921f426e7d /test/MultiFileAllocationIteratorTest.cc | |
| parent | f6f5a7e5eeec4f14418fec5a7be1bbe57a7ea7e1 (diff) | |
2010-11-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed SharedHandle::isNull(). Instead we added operator* and
operator unspecified_bool_type. Removed use of WeakHandle and
replaced with raw pointer.
Diffstat (limited to 'test/MultiFileAllocationIteratorTest.cc')
| -rw-r--r-- | test/MultiFileAllocationIteratorTest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/MultiFileAllocationIteratorTest.cc b/test/MultiFileAllocationIteratorTest.cc index 70b3a518..a391ab76 100644 --- a/test/MultiFileAllocationIteratorTest.cc +++ b/test/MultiFileAllocationIteratorTest.cc @@ -81,57 +81,57 @@ void MultiFileAllocationIteratorTest::testMakeDiskWriterEntries() CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file1"), entries[0]->getFilePath()); CPPUNIT_ASSERT(entries[0]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[0]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[0]->getDiskWriter()); // file2 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file2"), entries[1]->getFilePath()); CPPUNIT_ASSERT(entries[1]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[1]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[1]->getDiskWriter()); // file3 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file3"), entries[2]->getFilePath()); CPPUNIT_ASSERT(entries[2]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[2]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[2]->getDiskWriter()); // file4, diskWriter is not null, because file exists. CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file4"), entries[3]->getFilePath()); CPPUNIT_ASSERT(!entries[3]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[3]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[3]->getDiskWriter()); // file5 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file5"), entries[4]->getFilePath()); CPPUNIT_ASSERT(!entries[4]->needsFileAllocation()); - CPPUNIT_ASSERT(entries[4]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(!entries[4]->getDiskWriter()); // file6 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file6"), entries[5]->getFilePath()); CPPUNIT_ASSERT(entries[5]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[5]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[5]->getDiskWriter()); // file7 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file7"), entries[6]->getFilePath()); CPPUNIT_ASSERT(entries[6]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[6]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[6]->getDiskWriter()); // file8 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file8"), entries[7]->getFilePath()); CPPUNIT_ASSERT(entries[7]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[7]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[7]->getDiskWriter()); // file9 CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/file9"), entries[8]->getFilePath()); CPPUNIT_ASSERT(!entries[8]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[8]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[8]->getDiskWriter()); // fileA CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/fileA"), entries[9]->getFilePath()); CPPUNIT_ASSERT(!entries[9]->needsFileAllocation()); - CPPUNIT_ASSERT(entries[9]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(!entries[9]->getDiskWriter()); // fileB CPPUNIT_ASSERT_EQUAL(storeDir+std::string("/fileB"), entries[10]->getFilePath()); CPPUNIT_ASSERT(entries[10]->needsFileAllocation()); - CPPUNIT_ASSERT(!entries[10]->getDiskWriter().isNull()); + CPPUNIT_ASSERT(entries[10]->getDiskWriter()); } void MultiFileAllocationIteratorTest::testAllocate() |