Test: Move unit tests into separate directory

test/unit/testdotfile.cpp

@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2022 Riyyi
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <cstdio> // stderr
+#include <filesystem>
+#include <string>
+#include <unistd.h> // geteuid, setegid, seteuid
+#include <vector>
+
+#include "dotfile.h"
+#include "machine.h"
+#include "macro.h"
+#include "testcase.h"
+#include "testsuite.h"
+#include "util/file.h"
+#include "util/system.h"
+
+const bool root = !geteuid() ? true : false;
+const std::filesystem::path homeDirectory = "/home/" + Machine::the().username();
+const size_t homeDirectorySize = homeDirectory.string().size();
+
+void createTestDotfiles(const std::vector<std::string>& fileNames, const std::vector<std::string>& fileContents, bool asRoot = false)
+{
+	VERIFY(fileNames.size() == fileContents.size(), return);
+
+	if (root && !asRoot) {
+		setegid(Machine::the().gid());
+		seteuid(Machine::the().uid());
+	}
+
+	for (size_t i = 0; i < fileNames.size(); ++i) {
+		auto fileName = fileNames.at(i);
+
+		auto directory = std::filesystem::path { fileName }.parent_path();
+		if (!directory.empty() && !std::filesystem::exists(directory)) {
+			std::filesystem::create_directories(directory);
+		}
+
+		auto file = Util::File::create(fileName);
+		if (file.data().size() == 0) {
+			file.append(fileContents.at(i).c_str()).flush();
+		}
+	}
+
+	if (root && !asRoot) {
+		seteuid(0);
+		setegid(0);
+	}
+}
+
+void removeTestDotfiles(const std::vector<std::string>& files)
+{
+	for (auto file : files) {
+		// Get the top-level directory
+		if (file.find(homeDirectory) == 0) {
+			file = file.substr(homeDirectorySize + 1);
+		}
+		file = file.substr(0, file.find_first_of('/'));
+
+		// Delete recursively in working directory
+		if (std::filesystem::exists(file)) {
+			std::filesystem::remove_all(file);
+		}
+
+		// Delete recursively in home directory
+		file = homeDirectory / file;
+		if (std::filesystem::exists(file)) {
+			std::filesystem::remove_all(file);
+		}
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(AddDotfiles)
+{
+	std::vector<std::string> fileNames = {
+		homeDirectory / "__test-file-1",
+		homeDirectory / "__subdir/__test-file-2",
+		homeDirectory / "__subdir/__another-subdir/__test-file-3",
+	};
+
+	std::vector<std::string> fileContents = {
+		R"(home directory file 1
+)",
+		R"(home directory file 2
+)",
+		R"(home directory file 3
+)",
+	};
+
+	createTestDotfiles(fileNames, fileContents);
+
+	Dotfile::the().add(fileNames);
+
+	for (const auto& file : fileNames) {
+		VERIFY(std::filesystem::exists(file), continue);
+		VERIFY(std::filesystem::exists(file.substr(homeDirectorySize + 1)), continue);
+
+		Util::File lhs(file);
+		Util::File rhs(file.substr(homeDirectorySize + 1));
+		EXPECT_EQ(lhs.data(), rhs.data());
+	}
+
+	removeTestDotfiles(fileNames);
+}
+
+TEST_CASE(AddNonExistentDotfiles)
+{
+	stderr = Test::TestSuite::the().outputNull();
+	Dotfile::the().add({ homeDirectory / "__non-existent-test-file" });
+	stderr = Test::TestSuite::the().outputErr();
+
+	EXPECT(!std::filesystem::exists("__non-existent-test-file"));
+	removeTestDotfiles({ "__non-existent-test-file" });
+}
+
+TEST_CASE(PullDotfiles)
+{
+	std::vector<std::string> fileNames = {
+		"__test-file-1",
+		"__subdir/__test-file-2",
+		"__subdir/__another-subdir/__test-file-3",
+	};
+	std::vector<std::string> homeFileNames;
+	for (const auto& file : fileNames) {
+		homeFileNames.push_back(homeDirectory / file);
+	}
+
+	std::vector<std::string> homeFileContents = {
+		R"(file 1 after pulling
+)",
+		R"(file 2 after pulling
+)",
+		R"(file 3 after pulling
+)",
+	};
+	std::vector<std::string> workingDirectoryFileContents = {
+		R"(file 1
+)",
+		R"(file 2
+)",
+		R"(file 3
+)",
+	};
+
+	createTestDotfiles(homeFileNames, homeFileContents);
+	createTestDotfiles(fileNames, workingDirectoryFileContents);
+
+	Dotfile::the().pull(fileNames);
+
+	for (size_t i = 0; i < fileNames.size(); ++i) {
+		VERIFY(std::filesystem::exists(homeFileNames.at(i)), continue);
+		VERIFY(std::filesystem::exists(fileNames.at(i)), continue);
+
+		Util::File lhs(homeFileNames.at(i));
+		Util::File rhs(fileNames.at(i));
+		EXPECT_EQ(lhs.data(), rhs.data());
+	}
+
+	removeTestDotfiles(fileNames);
+}
+
+TEST_CASE(PushDotfiles)
+{
+	std::vector<std::string> fileNames = {
+		"__test-file-1",
+		"__subdir/__test-file-2",
+		"__subdir/__another-subdir/__test-file-3",
+	};
+
+	std::vector<std::string> fileContents = {
+		R"(working directory file 1
+)",
+		R"(working directory file 2
+)",
+		R"(working directory file 3
+)",
+	};
+
+	createTestDotfiles(fileNames, fileContents);
+
+	Dotfile::the().push(fileNames);
+
+	for (const auto& file : fileNames) {
+		VERIFY(std::filesystem::exists(file), continue);
+		VERIFY(std::filesystem::exists(homeDirectory / file), continue);
+
+		Util::File lhs(file);
+		Util::File rhs(homeDirectory / file);
+		EXPECT_EQ(lhs.data(), rhs.data());
+	}
+
+	removeTestDotfiles(fileNames);
+}
+
+TEST_CASE(PushDotfilesWithExcludePath)
+{
+	std::vector<std::string> fileNames = {
+		"__test-file-1",
+		"__subdir/__test-file-2",
+		"__subdir/__test-file-3",
+		"__another-subdir/__test-file-4.test",
+	};
+
+	createTestDotfiles(fileNames, { "", "", "", "" });
+
+	Dotfile::the().setExcludePaths({
+		{ Dotfile::ExcludeType::File, "__test-file-1" },
+		{ Dotfile::ExcludeType::Directory, "__subdir" },
+		{ Dotfile::ExcludeType::EndsWith, ".test" },
+	});
+	Dotfile::the().push(fileNames);
+	Dotfile::the().setExcludePaths({});
+
+	for (const auto& file : fileNames) {
+		EXPECT(!std::filesystem::exists(homeDirectory / file));
+	}
+
+	removeTestDotfiles(fileNames);
+}
+
+TEST_CASE(PushDotfilesSelectivelyComment)
+{
+	std::vector<std::string> fileNames = {
+		"__test-file-1",
+		"__test-file-2",
+		"__test-file-3",
+		"__test-file-4",
+		"__test-file-5",
+		"__test-file-6",
+		"__test-file-7",
+	};
+
+	auto distro = Machine::the().distroId();
+	auto hostname = Machine::the().hostname();
+	auto username = Machine::the().username();
+	std::string placeholder = "@@@@";
+
+	std::vector<std::string> fileContents = {
+		"# >>> distro=" + distro + " hostname=" + hostname + " user=" + username + R"(
+# this should be uncommented
+# <<<
+)",
+		"# >>> distro=" + placeholder + " hostname=" + hostname + " user=" + username + R"(
+# this should remain commented
+# <<<
+)",
+		"# >>> distro=" + distro + " hostname=" + placeholder + " user=" + username + R"(
+# this should remain commented
+# <<<
+)",
+		"# >>> distro=" + distro + " hostname=" + hostname + " user=" + placeholder + R"(
+this should be commented
+# <<<
+)",
+		"  # >>> distro=" + distro + R"(
+  # this should be uncommented
+  # <<<
+)",
+		"	# >>> user=" + username + R"(
+	# this should be uncommented
+	# <<<
+)",
+		"	  # >>> hostname=" + hostname + R"(
+	  this should remain uncommented
+	  # <<<
+)",
+	};
+
+	std::vector<std::string> pushedFileContents = {
+		"# >>> distro=" + distro + " hostname=" + hostname + " user=" + username + R"(
+this should be uncommented
+# <<<
+)",
+		"# >>> distro=" + placeholder + " hostname=" + hostname + " user=" + username + R"(
+# this should remain commented
+# <<<
+)",
+		"# >>> distro=" + distro + " hostname=" + placeholder + " user=" + username + R"(
+# this should remain commented
+# <<<
+)",
+		"# >>> distro=" + distro + " hostname=" + hostname + " user=" + placeholder + R"(
+# this should be commented
+# <<<
+)",
+		"  # >>> distro=" + distro + R"(
+  this should be uncommented
+  # <<<
+)",
+		"	# >>> user=" + username + R"(
+	this should be uncommented
+	# <<<
+)",
+		"	  # >>> hostname=" + hostname + R"(
+	  this should remain uncommented
+	  # <<<
+)",
+	};
+
+	createTestDotfiles(fileNames, fileContents);
+
+	Dotfile::the().push(fileNames);
+
+	for (size_t i = 0; i < fileNames.size(); ++i) {
+		const auto& file = fileNames.at(i);
+		VERIFY(std::filesystem::exists(file), continue);
+		VERIFY(std::filesystem::exists(homeDirectory / file), continue);
+
+		Util::File lhs(homeDirectory / file);
+		EXPECT_EQ(lhs.data(), pushedFileContents.at(i));
+	}
+
+	removeTestDotfiles(fileNames);
+}
+
+TEST_CASE(AddSystemDotfiles)
+{
+	VERIFY(geteuid() == 0, return);
+
+	Dotfile::the().setSystemDirectories({ "/etc", "/usr/lib" });
+	Dotfile::the().add({ "/etc/group", "/usr/lib/os-release" });
+	Dotfile::the().setSystemDirectories({});
+
+	EXPECT(std::filesystem::exists("etc/group"));
+	EXPECT(std::filesystem::exists("usr/lib/os-release"));
+
+	std::filesystem::remove_all(Dotfile::the().workingDirectory() / "etc");
+	std::filesystem::remove_all(Dotfile::the().workingDirectory() / "usr");
+}
+
+TEST_CASE(PullSystemDotfiles)
+{
+	VERIFY(geteuid() == 0, return);
+
+	createTestDotfiles({ "etc/group" }, { "" }, true);
+
+	Dotfile::the().setSystemDirectories({ "/etc" });
+	Dotfile::the().pull({ "etc/group" });
+	Dotfile::the().setSystemDirectories({});
+
+	Util::File lhs("/etc/group");
+	Util::File rhs(Dotfile::the().workingDirectory() / "etc/group");
+	EXPECT_EQ(lhs.data(), rhs.data());
+
+	std::filesystem::remove_all(Dotfile::the().workingDirectory() / "etc");
+}

test/unit/testutilargparser.cpp

@@ -0,0 +1,949 @@
+#include <functional> // function
+#include <string>
+#include <vector>
+
+#include "macro.h"
+#include "testcase.h"
+#include "testsuite.h"
+#include "util/argparser.h"
+
+bool runParser(std::vector<const char*> arguments, std::function<void(Util::ArgParser&)> initializer = {})
+{
+	stdout = Test::TestSuite::the().outputNull();
+
+	Util::ArgParser parser;
+	if (initializer) {
+		initializer(parser);
+	}
+
+	arguments.insert(arguments.begin(), "app");
+	auto result = parser.parse(arguments.size(), arguments.data());
+
+	stdout = Test::TestSuite::the().outputStd();
+	return result;
+}
+
+// -----------------------------------------
+
+TEST_CASE(NoArguments)
+{
+	auto result = runParser({});
+	EXPECT_EQ(result, true);
+}
+
+// -----------------------------------------
+
+TEST_CASE(NonExistentArguments)
+{
+	auto result = runParser({ "-n", "-e" });
+	EXPECT_EQ(result, false);
+
+	result = runParser({ "--non", "--existent" });
+	EXPECT_EQ(result, false);
+
+	result = runParser({ "-n", "-e", "--non", "--existent" });
+	EXPECT_EQ(result, false);
+
+	result = runParser({ "no", "handling" });
+	EXPECT_EQ(result, false);
+}
+
+// -----------------------------------------
+
+TEST_CASE(RequiredStringArguments)
+{
+	// Single required string argument
+	std::string stringArg1 = "";
+	auto result = runParser({ "my-required-argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my-required-argument");
+
+	// Single required string argument, not given
+	stringArg1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringArg1, "");
+
+	// Multiple required string arguments
+	stringArg1 = "";
+	std::string stringArg2 = "";
+	std::string stringArg3 = "";
+	result = runParser({ "my", "required", "argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my");
+	EXPECT_EQ(stringArg2, "required");
+	EXPECT_EQ(stringArg3, "argument");
+
+	// Multiple required string arguments, not given
+	stringArg1 = "";
+	stringArg2 = "";
+	stringArg3 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringArg1, "");
+	EXPECT_EQ(stringArg2, "");
+	EXPECT_EQ(stringArg3, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(OptionalStringArguments)
+{
+	// Single optional string argument
+	std::string stringArg1 = "";
+	auto result = runParser({ "my-optional-argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my-optional-argument");
+
+	// Single optional string argument, not given
+	stringArg1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "");
+
+	// Multiple optional string arguments
+	stringArg1 = "";
+	std::string stringArg2 = "";
+	std::string stringArg3 = "";
+	result = runParser({ "my", "optional", "argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my");
+	EXPECT_EQ(stringArg2, "optional");
+	EXPECT_EQ(stringArg3, "argument");
+
+	// Multiple optional string arguments, not given
+	stringArg1 = "";
+	stringArg2 = "";
+	stringArg3 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "");
+	EXPECT_EQ(stringArg2, "");
+	EXPECT_EQ(stringArg3, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(NonRequiredStringArguments)
+{
+	// Single non-required string argument
+	std::string stringArg1 = "";
+	auto result = runParser({ "my-non-required-argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my-non-required-argument");
+
+	// Single non-required string argument, not given
+	stringArg1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "");
+
+	// Multiple non-required string arguments
+	stringArg1 = "";
+	std::string stringArg2 = "";
+	std::string stringArg3 = "";
+	result = runParser({ "my", "non-required", "argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "my");
+	EXPECT_EQ(stringArg2, "non-required");
+	EXPECT_EQ(stringArg3, "argument");
+
+	// Multiple non-required string arguments, not given
+	stringArg1 = "";
+	stringArg2 = "";
+	stringArg3 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg2, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg3, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringArg1, "");
+	EXPECT_EQ(stringArg2, "");
+	EXPECT_EQ(stringArg3, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(VectorStringArguments)
+{
+	// Required vector string argument, not given
+	std::vector<std::string> vectorArg1 = {};
+	auto result = runParser({}, [&](auto& parser) {
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(vectorArg1.size(), 0);
+
+	// Required vector string argument, one given
+	vectorArg1 = {};
+	result = runParser({ "foo" }, [&](auto& parser) {
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1[0], "foo");
+	}
+
+	// Required vector string argument, two given
+	vectorArg1 = {};
+	result = runParser({ "hello", "world" }, [&](auto& parser) {
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorArg1.size(), 2);
+	if (vectorArg1.size() == 2) {
+		EXPECT_EQ(vectorArg1[0], "hello");
+		EXPECT_EQ(vectorArg1[1], "world");
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(CombinationOfNonRequiredArguments)
+{
+	// Optional arguments, one given
+	int intArg1 = 0;
+	double doubleArg1 = 0;
+	std::string stringArg1 = "";
+	auto result = runParser({ "optional argument" }, [&](auto& parser) {
+		parser.addArgument(intArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(doubleArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(intArg1, 0);
+	EXPECT_EQ(doubleArg1, 0);
+	EXPECT_EQ(stringArg1, "optional argument");
+
+	// Optional arguments, two given
+	intArg1 = 0;
+	doubleArg1 = 0;
+	stringArg1 = "";
+	result = runParser({ "999.999", "optional argument" }, [&](auto& parser) {
+		parser.addArgument(intArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(doubleArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(intArg1, 0);
+	EXPECT_EQ(doubleArg1, 999.999);
+	EXPECT_EQ(stringArg1, "optional argument");
+
+	// Optional arguments, two given, one valid
+	intArg1 = 0;
+	doubleArg1 = 0;
+	stringArg1 = "";
+	result = runParser({ "999,999", "optional argument" }, [&](auto& parser) {
+		parser.addArgument(intArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(doubleArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(intArg1, 0);
+	EXPECT_EQ(doubleArg1, 0);
+	EXPECT_EQ(stringArg1, "999,999");
+
+	// Optional arguments, two given, both valid but wrong order
+	stringArg1 = "";
+	intArg1 = 0;
+	doubleArg1 = 0;
+	result = runParser({ "999.999", "optional argument" }, [&](auto& parser) {
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(intArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(doubleArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringArg1, "999.999");
+	EXPECT_EQ(intArg1, 0);
+	EXPECT_EQ(doubleArg1, 0);
+}
+
+// -----------------------------------------
+
+TEST_CASE(BoolOptions)
+{
+	// Short option
+	bool boolOpt1 = false;
+	auto result = runParser({ "-b" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+
+	// Short option, not given
+	boolOpt1 = false;
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, false);
+
+	// Long option
+	boolOpt1 = false;
+	result = runParser({ "--bool" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, '\0', "bool", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+
+	// Long option, not given
+	boolOpt1 = false;
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(boolOpt1, '\0', "bool", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, false);
+
+	// Allow both short and long option, provide short
+	boolOpt1 = false;
+	result = runParser({ "-b" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', "bool", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+
+	// Allow both short and long option, provide long
+	boolOpt1 = false;
+	result = runParser({ "--bool" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', "bool", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+
+	// Allow both short and long option, provide both
+	boolOpt1 = false;
+	result = runParser({ "-b", "--bool" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', "bool", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+}
+
+// -----------------------------------------
+
+TEST_CASE(SingleRequiredStringOptions)
+{
+	// Single required string short option
+	std::string stringOpt1 = "";
+	auto result = runParser({ "-s", "my-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-required-argument");
+
+	// Single required string short option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "-smy-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-required-argument");
+
+	// Single required string short option, empty given
+	stringOpt1 = "";
+	result = runParser({ "-s" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single required string short option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single required string long option
+	stringOpt1 = "";
+	result = runParser({ "--string", "my-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-required-argument");
+
+	// Single required string long option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "--string=my-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-required-argument");
+
+	// Single required string long option, empty given
+	stringOpt1 = "";
+	result = runParser({ "--string" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single required string long option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(SingleOptionalStringOptions)
+{
+	// Single optional string short option
+	std::string stringOpt1 = "";
+	std::string stringArg1 = "";
+	auto result = runParser({ "-s", "my-optional-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+	EXPECT_EQ(stringArg1, "my-optional-argument");
+
+	// Single optional string short option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "-smy-optional-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-optional-argument");
+
+	// Single optional string short option, empty given
+	stringOpt1 = "";
+	result = runParser({ "-s" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single optional string short option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single optional string long option
+	stringOpt1 = "";
+	stringArg1 = "";
+	result = runParser({ "--string", "my-optional-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+	EXPECT_EQ(stringArg1, "my-optional-argument");
+
+	// Single optional string long option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "--string=my-optional-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "my-optional-argument");
+
+	// Single optional string long option, empty given
+	stringOpt1 = "";
+	result = runParser({ "--string" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single optional string long option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::Optional);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(SingleNonRequiredStringOptions)
+{
+	// Single non-required string short option
+	std::string stringOpt1 = "";
+	std::string stringArg1 = "";
+	auto result = runParser({ "-s", "my-non-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+	EXPECT_EQ(stringArg1, "my-non-required-argument");
+
+	// Single non-required string short option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "-smy-non-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single non-required string short option, empty given
+	stringOpt1 = "";
+	result = runParser({ "-s" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single non-required string short option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single non-required string long option
+	stringOpt1 = "";
+	stringArg1 = "";
+	result = runParser({ "--string", "my-non-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+		parser.addArgument(stringArg1, nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+	EXPECT_EQ(stringArg1, "my-non-required-argument");
+
+	// Single non-required string long option, given directly after
+	stringOpt1 = "";
+	result = runParser({ "--string=my-non-required-argument" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single non-required string long option, empty given
+	stringOpt1 = "";
+	result = runParser({ "--string" }, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+
+	// Single non-required string long option, not given
+	stringOpt1 = "";
+	result = runParser({}, [&](auto& parser) {
+		parser.addOption(stringOpt1, '\0', "string", nullptr, nullptr, nullptr, Util::ArgParser::Required::No);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(stringOpt1, "");
+}
+
+// -----------------------------------------
+
+TEST_CASE(NumberOptions)
+{
+	// Required int short option
+	int intOpt1 = 0;
+	auto result = runParser({ "-i", "2147483647" }, [&](auto& parser) {
+		parser.addOption(intOpt1, 'i', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(intOpt1, 2147483647);
+
+	// Required int short option, overflown value given
+	intOpt1 = 0;
+	result = runParser({ "-i", "2147483648" }, [&](auto& parser) {
+		parser.addOption(intOpt1, 'i', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(intOpt1, 0);
+
+	// Required int short option, empty given
+	intOpt1 = 0;
+	result = runParser({ "-i" }, [&](auto& parser) {
+		parser.addOption(intOpt1, 'i', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(intOpt1, 0);
+
+	// Required unsigned int short option
+	unsigned int unsignedIntOpt1 = 0;
+	result = runParser({ "-u", "4294967295" }, [&](auto& parser) {
+		parser.addOption(unsignedIntOpt1, 'u', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(unsignedIntOpt1, 4294967295);
+
+	// Required unsigned int short option, overflown value given
+	unsignedIntOpt1 = 0;
+	result = runParser({ "-u", "4294967296" }, [&](auto& parser) {
+		parser.addOption(unsignedIntOpt1, 'u', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(unsignedIntOpt1, 0);
+
+	// Required unsigned int short option, empty given
+	unsignedIntOpt1 = 0;
+	result = runParser({ "-u" }, [&](auto& parser) {
+		parser.addOption(unsignedIntOpt1, 'u', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(unsignedIntOpt1, 0);
+
+	// Required double short option
+	double doubleOpt1 = 0;
+	result = runParser({ "-d", "999.999" }, [&](auto& parser) {
+		parser.addOption(doubleOpt1, 'd', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(doubleOpt1, 999.999);
+
+	// Required double short option, empty given
+	doubleOpt1 = 0;
+	result = runParser({ "-d" }, [&](auto& parser) {
+		parser.addOption(doubleOpt1, 'd', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(doubleOpt1, 0);
+}
+
+// -----------------------------------------
+
+TEST_CASE(VectorStringOptions)
+{
+	// Required vector string short option, not given
+	std::vector<std::string> vectorOpt1 = {};
+	auto result = runParser({}, [&](auto& parser) {
+		parser.addOption(vectorOpt1, 'v', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 0);
+
+	// Required vector string short option, empty given
+	vectorOpt1 = {};
+	result = runParser({ "-v" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, 'v', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(vectorOpt1.size(), 0);
+
+	// Required vector string short option, one given
+	vectorOpt1 = {};
+	result = runParser({ "-v", "a vector argument!" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, 'v', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 1);
+	if (vectorOpt1.size() == 1) {
+		EXPECT_EQ(vectorOpt1[0], "a vector argument!");
+	}
+
+	// Required vector string short option, two given
+	vectorOpt1 = {};
+	result = runParser({ "-v", "hello", "-v", "world" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, 'v', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 2);
+	if (vectorOpt1.size() == 2) {
+		EXPECT_EQ(vectorOpt1[0], "hello");
+		EXPECT_EQ(vectorOpt1[1], "world");
+	}
+
+	// Required vector string short option, two given directly after
+	vectorOpt1 = {};
+	result = runParser({ "-vhello", "-vworld" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, 'v', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 2);
+	if (vectorOpt1.size() == 2) {
+		EXPECT_EQ(vectorOpt1[0], "hello");
+		EXPECT_EQ(vectorOpt1[1], "world");
+	}
+
+	// Required vector string long option, empty given
+	vectorOpt1 = {};
+	result = runParser({ "--vector" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, '\0', "vector", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(vectorOpt1.size(), 0);
+
+	// Required vector string long option, one given
+	vectorOpt1 = {};
+	result = runParser({ "--vector", "a vector argument!" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, '\0', "vector", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 1);
+	if (vectorOpt1.size() == 1) {
+		EXPECT_EQ(vectorOpt1[0], "a vector argument!");
+	}
+
+	// Required vector string long option, two given
+	vectorOpt1 = {};
+	result = runParser({ "--vector", "hello", "--vector", "world" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, '\0', "vector", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 2);
+	if (vectorOpt1.size() == 2) {
+		EXPECT_EQ(vectorOpt1[0], "hello");
+		EXPECT_EQ(vectorOpt1[1], "world");
+	}
+
+	// Required vector string long option, two given directly after
+	vectorOpt1 = {};
+	result = runParser({ "--vector=hello", "--vector=world" }, [&](auto& parser) {
+		parser.addOption(vectorOpt1, '\0', "vector", nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(vectorOpt1.size(), 2);
+	if (vectorOpt1.size() == 2) {
+		EXPECT_EQ(vectorOpt1.at(0), "hello");
+		EXPECT_EQ(vectorOpt1.at(1), "world");
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(MultipleOptions)
+{
+	// Both short options, second is required, with a non-option parameter in-between
+	bool boolOpt1 = false;
+	std::string stringOpt1 = "";
+	std::vector<std::string> vectorArg1 = {};
+	auto result = runParser({ "-b", "something", "-s", "a-string-value" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(stringOpt1, 's', nullptr, nullptr, nullptr, nullptr, Util::ArgParser::Required::Yes);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(stringOpt1, "a-string-value");
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "something");
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(StopOnDoubleDashOption)
+{
+	// Bool short options, missing
+	// Expected: The bool options are interpreted as non-option parameters
+	bool boolOpt1 = false;
+	bool boolOpt2 = false;
+	std::vector<std::string> vectorArg1 = {};
+	auto result = runParser({ "--", "-b", "-c" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, false);
+	EXPECT_EQ(boolOpt2, false);
+	EXPECT_EQ(vectorArg1.size(), 2);
+	if (vectorArg1.size() == 2) {
+		EXPECT_EQ(vectorArg1.at(0), "-b");
+		EXPECT_EQ(vectorArg1.at(1), "-c");
+	}
+
+	// Bool short options, one given
+	// Expected: boolOpt1 is set, one non-option parameter
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "-b", "--", "-c" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, false);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "-c");
+	}
+
+	// Bool long options, missing
+	// Expected: The bool options are interpreted as non-option parameters
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "--", "--bool", "--cool" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, '\0', "bool", nullptr, nullptr);
+		parser.addOption(boolOpt2, '\0', "cool", nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, false);
+	EXPECT_EQ(boolOpt2, false);
+	EXPECT_EQ(vectorArg1.size(), 2);
+	if (vectorArg1.size() == 2) {
+		EXPECT_EQ(vectorArg1.at(0), "--bool");
+		EXPECT_EQ(vectorArg1.at(1), "--cool");
+	}
+
+	// Bool long options, one given
+	// Expected: boolOpt1 is set, one non-option parameter
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "--bool", "--", "--cool" }, [&](auto& parser) {
+		parser.addOption(boolOpt1, '\0', "bool", nullptr, nullptr);
+		parser.addOption(boolOpt2, '\0', "cool", nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, false);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "--cool");
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(StopOnFirstNonOption)
+{
+	// Do not stop on first non-option; arguments are in correct order
+	// Expected: The bool options are set and one non-option parameter
+	bool boolOpt1 = false;
+	bool boolOpt2 = false;
+	std::vector<std::string> vectorArg1 = {};
+	auto result = runParser({ "-b", "-c", "stopping" }, [&](auto& parser) {
+		parser.setStopParsingOnFirstNonOption(false);
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, true);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "stopping");
+	}
+
+	// Do not stop on first non-option; arguments are in wrong order
+	// Expected: The bool options are set and one non-option parameter
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "-b", "stopping", "-c" }, [&](auto& parser) {
+		parser.setStopParsingOnFirstNonOption(false);
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, true);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "stopping");
+	}
+
+	// Stop on first non option, arguments are in correct order
+	// Expected: The bool options are set and one non-option parameter
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "-b", "-c", "stopping" }, [&](auto& parser) {
+		parser.setStopParsingOnFirstNonOption(true);
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, true);
+	EXPECT_EQ(vectorArg1.size(), 1);
+	if (vectorArg1.size() == 1) {
+		EXPECT_EQ(vectorArg1.at(0), "stopping");
+	}
+
+	// Stop on first non option, arguments are in wrong order
+	// Expected: boolOpt1 is set and the rest are non-option parameters
+	boolOpt1 = false;
+	boolOpt2 = false;
+	vectorArg1 = {};
+	result = runParser({ "-b", "stopping", "-c" }, [&](auto& parser) {
+		parser.setStopParsingOnFirstNonOption(true);
+		parser.addOption(boolOpt1, 'b', nullptr, nullptr, nullptr);
+		parser.addOption(boolOpt2, 'c', nullptr, nullptr, nullptr);
+		parser.addArgument(vectorArg1, nullptr, nullptr, nullptr);
+	});
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(boolOpt1, true);
+	EXPECT_EQ(boolOpt2, false);
+	EXPECT_EQ(vectorArg1.size(), 2);
+	if (vectorArg1.size() == 2) {
+		EXPECT_EQ(vectorArg1.at(0), "stopping");
+		EXPECT_EQ(vectorArg1.at(1), "-c");
+	}
+}
+
+// -----------------------------------------
+
+TEST_CASE(ExitOnFirstError)
+{
+	// Do not stop on first error, one non-existing given
+	// Expected: parsing fails, boolOpt1 is set
+	bool boolOpt1 = false;
+	auto result = runParser({ "--this-doesnt-exist", "--this-exist" }, [&](auto& parser) {
+		parser.setExitOnFirstError(false);
+		parser.addOption(boolOpt1, '\0', "this-exist", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(boolOpt1, true);
+
+	// Stop on first error, one non-existing given
+	// Expected: parsing fails, boolOpt1 is not set
+	boolOpt1 = false;
+	result = runParser({ "--this-doesnt-exist", "--this-exist" }, [&](auto& parser) {
+		parser.setExitOnFirstError(true);
+		parser.addOption(boolOpt1, '\0', "this-exist", nullptr, nullptr);
+	});
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(boolOpt1, false);
+}

test/unit/testutilshell.cpp

@@ -0,0 +1,39 @@
+#include <string>
+
+#include "macro.h"
+#include "testcase.h"
+#include "testsuite.h"
+#include "util/shell.h"
+
+bool runShell(const char* command, std::string* output = nullptr)
+{
+	stdout = Test::TestSuite::the().outputNull();
+
+	Util::Shell $;
+	auto exec = $(command);
+	if (output) {
+		*output = exec.output();
+	}
+
+	stdout = Test::TestSuite::the().outputStd();
+	return !exec.status() ? true : false;
+}
+
+// -----------------------------------------
+
+TEST_CASE(ShellCommand)
+{
+	// Pipe test, grep section of the echo command, return true
+	std::string output = "";
+	auto result = runShell("echo 'Hello World!' | grep --only-matching 'Hello'", &output);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello\n");
+
+	// Return false
+	result = runShell("exit 1");
+	EXPECT_EQ(result, false);
+
+	// Return false
+	result = runShell("failure() { return 1; }; failure");
+	EXPECT_EQ(result, false);
+}

test/unit/testutilsystem.cpp

@@ -0,0 +1,98 @@
+#include <functional> // function
+#include <string>
+#include <vector>
+
+#include "macro.h"
+#include "testcase.h"
+#include "testsuite.h"
+#include "util/system.h"
+
+bool runSystem(std::function<Util::System(Util::System&)> commands, std::string* output = nullptr, std::string* error = nullptr)
+{
+	Util::System system;
+	auto exec = commands(system);
+	if (output) {
+		*output = exec.output();
+	}
+	if (error) {
+		*error = exec.error();
+	}
+
+	return !exec.status() ? true : false;
+}
+
+// -----------------------------------------
+
+TEST_CASE(SystemCommand)
+{
+	// Regular echo command, return true
+	std::string output = "";
+	std::string error = "";
+	auto result = runSystem([&](auto& $) {
+		return $("echo Hello World!")();
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello World!\n");
+	EXPECT_EQ(error, "");
+
+	// Apend output of two echo commands, return true
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return $("echo -n Hello ") + $("echo -n World!");
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello World!");
+	EXPECT_EQ(error, "");
+
+	// Pipe test, grep section of the echo command, return true
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return $("echo Hello World!") | $("grep --only-matching Hello");
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello\n");
+	EXPECT_EQ(error, "");
+
+	// Run all commands until first false, return true
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return $("echo Hello") && $("echo World!");
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello\nWorld!\n");
+	EXPECT_EQ(error, "");
+
+	// Run all commands until first true, return true
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return $("echo Hello") || $("echo World!");
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "Hello\n");
+	EXPECT_EQ(error, "");
+
+	// And plus pipe test, grep the middle word, return true
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return ($("echo -n one ") && $("echo -n two ") && $("echo -n three")) | $("grep --only-matching two");
+	}, &output, &error);
+	EXPECT_EQ(result, true);
+	EXPECT_EQ(output, "two\n");
+	EXPECT_EQ(error, "");
+
+	// FIXME waitpid does not seem to get the right exit status here
+	// Return false
+	output = "";
+	error = "";
+	result = runSystem([&](auto& $) {
+		return $("exit 1")();
+	}, &output, &error);
+	EXPECT_EQ(result, false);
+	EXPECT_EQ(output, "");
+	EXPECT_EQ(error, "");
+}