diff options
Diffstat (limited to 'memfilepersistence/src/tests/device')
3 files changed, 12 insertions, 13 deletions
diff --git a/memfilepersistence/src/tests/device/devicemanagertest.cpp b/memfilepersistence/src/tests/device/devicemanagertest.cpp index eeb5007f452..7e26543349b 100644 --- a/memfilepersistence/src/tests/device/devicemanagertest.cpp +++ b/memfilepersistence/src/tests/device/devicemanagertest.cpp @@ -94,7 +94,7 @@ void DeviceManagerTest::testEventSending() DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); Listener l; manager.addIOEventListener(l); - Directory::LP dir(manager.getDirectory("/home/foo/var", 0)); + Directory::SP dir(manager.getDirectory("/home/foo/var", 0)); // IO failures are disk events. Will mark all partitions and // directories on that disk bad dir->addEvent(IOEvent::createEventFromErrno(1, EIO, "/home/foo/var/foo")); @@ -117,7 +117,7 @@ void DeviceManagerTest::testEventSending() void DeviceManagerTest::testXml() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Directory::LP dir(manager.getDirectory("/home/", 0)); + Directory::SP dir(manager.getDirectory("/home/", 0)); dir->getPartition().initializeMonitor(); std::string xml = manager.toXml(" "); CPPUNIT_ASSERT_MSG(xml, diff --git a/memfilepersistence/src/tests/device/devicestest.cpp b/memfilepersistence/src/tests/device/devicestest.cpp index bd6898cb7ac..8bcc93e5fc9 100644 --- a/memfilepersistence/src/tests/device/devicestest.cpp +++ b/memfilepersistence/src/tests/device/devicestest.cpp @@ -31,11 +31,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(DevicesTest); void DevicesTest::testDisk() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Disk::LP disk1(manager.getDisk("/something/on/disk")); - Disk::LP disk2(manager.getDisk("/something/on/disk")); + Disk::SP disk1(manager.getDisk("/something/on/disk")); + Disk::SP disk2(manager.getDisk("/something/on/disk")); CPPUNIT_ASSERT_EQUAL(disk1->getId(), disk2->getId()); CPPUNIT_ASSERT_EQUAL(disk1.get(), disk2.get()); - Disk::LP disk3(manager.getDisk("/something/on/disk2")); + Disk::SP disk3(manager.getDisk("/something/on/disk2")); CPPUNIT_ASSERT(disk2->getId() != disk3->getId()); disk3->toString(); // Add code coverage } @@ -43,7 +43,7 @@ void DevicesTest::testDisk() void DevicesTest::testPartition() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Partition::LP part(manager.getPartition("/etc")); + Partition::SP part(manager.getPartition("/etc")); CPPUNIT_ASSERT_EQUAL(std::string("/etc"), part->getMountPoint()); part->toString(); // Add code coverage } @@ -51,7 +51,7 @@ void DevicesTest::testPartition() void DevicesTest::testDirectory() { DeviceManager manager(DeviceMapper::UP(new SimpleDeviceMapper), _clock); - Directory::LP dir1(manager.getDirectory("/on/disk", 0)); + Directory::SP dir1(manager.getDirectory("/on/disk", 0)); CPPUNIT_ASSERT_EQUAL(std::string("/on/disk"), dir1->getPath()); CPPUNIT_ASSERT(dir1->getLastEvent() == 0); CPPUNIT_ASSERT_EQUAL(Device::OK, dir1->getState()); diff --git a/memfilepersistence/src/tests/device/mountpointlisttest.cpp b/memfilepersistence/src/tests/device/mountpointlisttest.cpp index 4cb5822ceb7..aaeff981af8 100644 --- a/memfilepersistence/src/tests/device/mountpointlisttest.cpp +++ b/memfilepersistence/src/tests/device/mountpointlisttest.cpp @@ -7,7 +7,6 @@ #include <vespa/vespalib/io/fileutil.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> -using vespalib::LinkedPtr; using vespalib::fileExists; using vespalib::isDirectory; using vespalib::isSymLink; @@ -37,8 +36,8 @@ public: framework::defaultimplementation::FakeClock _clock; private: - LinkedPtr<DeviceManager> newDeviceManager() { - return LinkedPtr<DeviceManager>( + DeviceManager::UP newDeviceManager() { + return DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock)); @@ -88,7 +87,7 @@ void MountPointList_Test::testScanning() init(); MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); @@ -133,7 +132,7 @@ void MountPointList_Test::testStatusFile() { MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); @@ -195,7 +194,7 @@ void MountPointList_Test::testStatusFile() { MountPointList list(_prefix, std::vector<vespalib::string>(), - vespalib::LinkedPtr<DeviceManager>( + DeviceManager::UP( new DeviceManager( DeviceMapper::UP(new SimpleDeviceMapper), _clock))); |