0 -> nullptr cleanup.

[dcpomatic.git] / test / disk_writer_test.cc

diff --git a/test/disk_writer_test.cc b/test/disk_writer_test.cc
index 7b3778b671c7b9b9a930d18d3cf222df3e017147..481e72548065596772df092496a4d77361476111 100644 (file)
--- a/test/disk_writer_test.cc
+++ b/test/disk_writer_test.cc
@@ -69,13 +69,14 @@ BOOST_AUTO_TEST_CASE (disk_writer_test1)
        using namespace boost::filesystem;
        using namespace boost::process;
 
-       remove_all ("build/test/disk_writer_test1.disk");
-       remove_all ("build/test/disk_writer_test1.partition");
-       remove_all ("build/test/disk_writer_test1");
+       Cleanup cl;
 
        path disk = "build/test/disk_writer_test1.disk";
        path partition = "build/test/disk_writer_test1.partition";
 
+       cl.add(disk);
+       cl.add(partition);
+
        /* lwext4 has a lower limit of correct ext2 partition sizes it can make; 32Mb
         * does not work here: fsck gives errors about an incorrect free blocks count.
         */
@@ -87,7 +88,7 @@ BOOST_AUTO_TEST_CASE (disk_writer_test1)
        /* Some arbitrary file size here */
        make_random_file (dcp / "foo", 1024 * 1024 * 32 - 6128);
 
-       dcpomatic::write (dcp, disk.string(), partition.string(), 0);
+       dcpomatic::write (dcp, disk.string(), partition.string(), nullptr);
 
        BOOST_CHECK_EQUAL (system("/sbin/e2fsck -fn build/test/disk_writer_test1.partition"), 0);
 
@@ -124,6 +125,8 @@ BOOST_AUTO_TEST_CASE (disk_writer_test1)
 
        system ("e2cp " + partition.string() + ":disk_writer_test1/foo build/test/disk_writer_test1_foo_back");
        check_file ("build/test/disk_writer_test1/foo", "build/test/disk_writer_test1_foo_back");
+
+       cl.run();
 }
 
 
@@ -148,7 +151,7 @@ BOOST_AUTO_TEST_CASE (disk_writer_test2)
        make_random_file(partition, 4LL * 1024LL * 1024LL * 1024LL);
 
        auto const dcp = TestPaths::private_data() / "xm";
-       dcpomatic::write(dcp, disk.string(), partition.string(), 0);
+       dcpomatic::write(dcp, disk.string(), partition.string(), nullptr);
 
        BOOST_CHECK_EQUAL(system("/sbin/e2fsck -fn build/test/disk_writer_test2.partition"), 0);