C++11 tidying.

1 files changed, 40 insertions, 35 deletions

diff --git a/test/file_group_test.cc b/test/file_group_test.cc
index 1d42741b6..f974a3725 100644
--- a/test/file_group_test.cc
+++ b/test/file_group_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,23 @@
 
 */
 
+
 /** @file  test/file_group_test.cc
  *  @brief Test FileGroup class.
  *  @ingroup selfcontained
  */
 
-#include <stdint.h>
-#include <cstdio>
+
+#include "lib/file_group.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
-#include "lib/file_group.h"
+#include <stdint.h>
+#include <cstdio>
+
 
 using std::vector;
 
+
 BOOST_AUTO_TEST_CASE (file_group_test)
 {
 	/* Random data; must be big enough for all the files */
@@ -53,16 +57,17 @@ BOOST_AUTO_TEST_CASE (file_group_test)
 		total_length += length[i];
 	}
 
-	vector<boost::filesystem::path> name;
 	boost::filesystem::create_directories ("build/test/file_group_test");
-	name.push_back ("build/test/file_group_test/A");
-	name.push_back ("build/test/file_group_test/B");
-	name.push_back ("build/test/file_group_test/C");
-	name.push_back ("build/test/file_group_test/D");
+	vector<boost::filesystem::path> name = {
+		"build/test/file_group_test/A",
+		"build/test/file_group_test/B",
+		"build/test/file_group_test/C",
+		"build/test/file_group_test/D"
+	};
 
 	int base = 0;
 	for (int i = 0; i < num_files; ++i) {
-		FILE* f = fopen (name[i].string().c_str(), "wb");
+		auto f = fopen (name[i].string().c_str(), "wb");
 		fwrite (data + base, 1, length[i], f);
 		fclose (f);
 		base += length[i];
@@ -74,51 +79,51 @@ BOOST_AUTO_TEST_CASE (file_group_test)
 	int pos = 0;
 
 	/* Basic read from 0 */
-	BOOST_CHECK_EQUAL (fg.read (test, 64), 64);
-	BOOST_CHECK_EQUAL (memcmp (data, test, 64), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, 64), 64);
+	BOOST_CHECK_EQUAL (memcmp(data, test, 64), 0);
 	pos += 64;
 
 	/* Another read following the previous */
-	BOOST_CHECK_EQUAL (fg.read (test, 4), 4);
-	BOOST_CHECK_EQUAL (memcmp (data + pos, test, 4), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, 4), 4);
+	BOOST_CHECK_EQUAL (memcmp(data + pos, test, 4), 0);
 	pos += 4;
 
 	/* Read overlapping A and B */
-	BOOST_CHECK_EQUAL (fg.read (test, 128), 128);
-	BOOST_CHECK_EQUAL (memcmp (data + pos, test, 128), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, 128), 128);
+	BOOST_CHECK_EQUAL (memcmp(data + pos, test, 128), 0);
 	pos += 128;
 
 	/* Read overlapping B/C/D and over-reading by a lot */
-	BOOST_CHECK_EQUAL (fg.read (test, total_length * 3), total_length - pos);
-	BOOST_CHECK_EQUAL (memcmp (data + pos, test, total_length - pos), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, total_length * 3), total_length - pos);
+	BOOST_CHECK_EQUAL (memcmp(data + pos, test, total_length - pos), 0);
 
 	/* Over-read by a little */
-	BOOST_CHECK_EQUAL (fg.seek (0, SEEK_SET), 0);
-	BOOST_CHECK_EQUAL (fg.read (test, total_length), total_length);
-	BOOST_CHECK_EQUAL (fg.read (test, 1), 0);
+	BOOST_CHECK_EQUAL (fg.seek(0, SEEK_SET), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, total_length), total_length);
+	BOOST_CHECK_EQUAL (fg.read(test, 1), 0);
 
 	/* Seeking off the end of the file should not give an error */
-	BOOST_CHECK_EQUAL (fg.seek (total_length * 2, SEEK_SET), total_length * 2);
+	BOOST_CHECK_EQUAL (fg.seek(total_length * 2, SEEK_SET), total_length * 2);
 	/* and attempting to read should return nothing */
-	BOOST_CHECK_EQUAL (fg.read (test, 64), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, 64), 0);
 	/* but the requested seek should be remembered, so if we now go back (relatively) */
-	BOOST_CHECK_EQUAL (fg.seek (-total_length * 2, SEEK_CUR), 0);
+	BOOST_CHECK_EQUAL (fg.seek(-total_length * 2, SEEK_CUR), 0);
 	/* we should be at the start again */
-	BOOST_CHECK_EQUAL (fg.read (test, 64), 64);
-	BOOST_CHECK_EQUAL (memcmp (data, test, 64), 0);
+	BOOST_CHECK_EQUAL (fg.read(test, 64), 64);
+	BOOST_CHECK_EQUAL (memcmp(data, test, 64), 0);
 
 	/* SEEK_SET */
-	BOOST_CHECK_EQUAL (fg.seek (999, SEEK_SET), 999);
-	BOOST_CHECK_EQUAL (fg.read (test, 64), 64);
-	BOOST_CHECK_EQUAL (memcmp (data + 999, test, 64), 0);
+	BOOST_CHECK_EQUAL (fg.seek(999, SEEK_SET), 999);
+	BOOST_CHECK_EQUAL (fg.read(test, 64), 64);
+	BOOST_CHECK_EQUAL (memcmp(data + 999, test, 64), 0);
 
 	/* SEEK_CUR */
-	BOOST_CHECK_EQUAL (fg.seek (42, SEEK_CUR), 999 + 64 + 42);
-	BOOST_CHECK_EQUAL (fg.read (test, 64), 64);
-	BOOST_CHECK_EQUAL (memcmp (data + 999 + 64 + 42, test, 64), 0);
+	BOOST_CHECK_EQUAL (fg.seek(42, SEEK_CUR), 999 + 64 + 42);
+	BOOST_CHECK_EQUAL (fg.read(test, 64), 64);
+	BOOST_CHECK_EQUAL (memcmp(data + 999 + 64 + 42, test, 64), 0);
 
 	/* SEEK_END */
-	BOOST_CHECK_EQUAL (fg.seek (1077, SEEK_END), total_length - 1077);
-	BOOST_CHECK_EQUAL (fg.read (test, 256), 256);
-	BOOST_CHECK_EQUAL (memcmp (data + total_length - 1077, test, 256), 0);
+	BOOST_CHECK_EQUAL (fg.seek(1077, SEEK_END), total_length - 1077);
+	BOOST_CHECK_EQUAL (fg.read(test, 256), 256);
+	BOOST_CHECK_EQUAL (memcmp(data + total_length - 1077, test, 256), 0);
 }