service/test: Reset command-line on SetUp (f5a6bc3c) · Commits · e / os / android_packages_modules_Bluetooth

system/service/settings.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ bool Settings::Init() {
		// Check for libbase logging switches. These get processed by
		// logging::InitLogging directly.
		else if (iter.first != ::switches::kV) {
		LOG(ERROR) << "Unexpected command-line switches found";
		LOG(ERROR) << "Unexpected command-line switches found: " << iter.first;
		return false;
		}
		}

system/service/test/settings_unittest.cpp

+12 −8

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ class SettingsTest : public ::testing::Test {
		public:
		SettingsTest() = default;

		void SetUp() override {
		base::CommandLine::Reset();
		}

		void TearDown() override {
		base::CommandLine::Reset();
		}
		@@ -45,7 +49,7 @@ class SettingsTest : public ::testing::Test {

		TEST_F(SettingsTest, EmptyCommandLine) {
		const base::CommandLine::CharType* argv[] = { "program" };
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_TRUE(settings_.Init());
		}

		@@ -53,7 +57,7 @@ TEST_F(SettingsTest, UnexpectedSwitches1) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--create-ipc-socket=foobar", "--foobarbaz"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_FALSE(settings_.Init());
		}

		@@ -61,7 +65,7 @@ TEST_F(SettingsTest, UnexpectedSwitches2) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--foobarbaz"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_FALSE(settings_.Init());
		}

		@@ -69,7 +73,7 @@ TEST_F(SettingsTest, UnexpectedArguments1) {
		const base::CommandLine::CharType* argv[] = {
		"program", "foobarbaz"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_FALSE(settings_.Init());
		}

		@@ -77,7 +81,7 @@ TEST_F(SettingsTest, UnexpectedArguments2) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--create-ipc-socket=foobar", "foobarbaz"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_FALSE(settings_.Init());
		}

		@@ -85,7 +89,7 @@ TEST_F(SettingsTest, TooManyIpcOptions) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--create-ipc-socket=foobar",
		"--android-ipc-socket-suffix=foobar"};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_FALSE(settings_.Init());
		}

		@@ -93,7 +97,7 @@ TEST_F(SettingsTest, GoodArgumentsCreateIpc) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--create-ipc-socket=foobar"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_TRUE(settings_.Init());
		}

		@@ -101,7 +105,7 @@ TEST_F(SettingsTest, GoodArgumentsAndroidIpc) {
		const base::CommandLine::CharType* argv[] = {
		"program", "--android-ipc-socket-suffix=foobar"
		};
		base::CommandLine::Init(arraysize(argv), argv);
		EXPECT_TRUE(base::CommandLine::Init(arraysize(argv), argv));
		EXPECT_TRUE(settings_.Init());
		}