Merge "crash_report: Fix several signed-unsigned comparison warnings in tests." (ac06dcd2) · Commits · e / os / android_system_core

crash_reporter/crash_collector_test.cc

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -74,10 +74,11 @@ TEST_F(CrashCollectorTest, Initialize) {
	TEST_F(CrashCollectorTest, WriteNewFile) {		TEST_F(CrashCollectorTest, WriteNewFile) {
	FilePath test_file = test_dir_.path().Append("test_new");		FilePath test_file = test_dir_.path().Append("test_new");
	const char kBuffer[] = "buffer";		const char kBuffer[] = "buffer";
	EXPECT_EQ(strlen(kBuffer),		unsigned int numBytesWritten = collector_.WriteNewFile(
	collector_.WriteNewFile(test_file,		test_file,
	kBuffer,		kBuffer,
	strlen(kBuffer)));		strlen(kBuffer));
			EXPECT_EQ(strlen(kBuffer), numBytesWritten);
	EXPECT_LT(collector_.WriteNewFile(test_file,		EXPECT_LT(collector_.WriteNewFile(test_file,
	kBuffer,		kBuffer,
	strlen(kBuffer)), 0);		strlen(kBuffer)), 0);

crash_reporter/kernel_collector_test.cc

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,9 @@ class KernelCollectorTest : public ::testing::Test {
	protected:		protected:
	void WriteStringToFile(const FilePath &file_path,		void WriteStringToFile(const FilePath &file_path,
	const char *data) {		const char *data) {
	ASSERT_EQ(strlen(data), base::WriteFile(file_path, data, strlen(data)));		unsigned int numBytesWritten =
			base::WriteFile(file_path, data, strlen(data));
			ASSERT_EQ(strlen(data), numBytesWritten);
	}		}

	void SetUpSuccessfulCollect();		void SetUpSuccessfulCollect();
	@@ -284,7 +286,7 @@ TEST_F(KernelCollectorTest, CollectOK) {
	size_t end_pos = filename.find_first_of("\n");		size_t end_pos = filename.find_first_of("\n");
	ASSERT_NE(std::string::npos, end_pos);		ASSERT_NE(std::string::npos, end_pos);
	filename = filename.substr(0, end_pos);		filename = filename.substr(0, end_pos);
	ASSERT_EQ(0, filename.find(test_crash_directory().value()));		ASSERT_EQ(0U, filename.find(test_crash_directory().value()));
	ASSERT_TRUE(base::PathExists(FilePath(filename)));		ASSERT_TRUE(base::PathExists(FilePath(filename)));
	std::string contents;		std::string contents;
	ASSERT_TRUE(base::ReadFileToString(FilePath(filename), &contents));		ASSERT_TRUE(base::ReadFileToString(FilePath(filename), &contents));

crash_reporter/unclean_shutdown_collector_test.cc

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,9 @@ class UncleanShutdownCollectorTest : public ::testing::Test {
	protected:		protected:
	void WriteStringToFile(const FilePath &file_path,		void WriteStringToFile(const FilePath &file_path,
	const char *data) {		const char *data) {
	ASSERT_EQ(strlen(data), base::WriteFile(file_path, data, strlen(data)));		unsigned int numBytesWritten =
			base::WriteFile(file_path, data, strlen(data));
			ASSERT_EQ(strlen(data), numBytesWritten);
	}		}

	UncleanShutdownCollectorMock collector_;		UncleanShutdownCollectorMock collector_;

crash_reporter/user_collector_test.cc

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -101,15 +101,15 @@ TEST_F(UserCollectorTest, ParseCrashAttributes) {
	&pid, &signal, &uid, &gid, &exec_name));		&pid, &signal, &uid, &gid, &exec_name));
	EXPECT_EQ(123456, pid);		EXPECT_EQ(123456, pid);
	EXPECT_EQ(11, signal);		EXPECT_EQ(11, signal);
	EXPECT_EQ(1000, uid);		EXPECT_EQ(1000U, uid);
	EXPECT_EQ(2000, gid);		EXPECT_EQ(2000U, gid);
	EXPECT_EQ("foobar", exec_name);		EXPECT_EQ("foobar", exec_name);
	EXPECT_TRUE(collector_.ParseCrashAttributes("4321:6:barfoo",		EXPECT_TRUE(collector_.ParseCrashAttributes("4321:6:barfoo",
	&pid, &signal, &uid, &gid, &exec_name));		&pid, &signal, &uid, &gid, &exec_name));
	EXPECT_EQ(4321, pid);		EXPECT_EQ(4321, pid);
	EXPECT_EQ(6, signal);		EXPECT_EQ(6, signal);
	EXPECT_EQ(-1, uid);		EXPECT_EQ(-1U, uid);
	EXPECT_EQ(-1, gid);		EXPECT_EQ(-1U, gid);
	EXPECT_EQ("barfoo", exec_name);		EXPECT_EQ("barfoo", exec_name);

	EXPECT_FALSE(collector_.ParseCrashAttributes("123456:11",		EXPECT_FALSE(collector_.ParseCrashAttributes("123456:11",
	@@ -333,8 +333,8 @@ TEST_F(UserCollectorTest, GetUserInfoFromName) {
	gid_t gid = 100;		gid_t gid = 100;
	uid_t uid = 100;		uid_t uid = 100;
	EXPECT_TRUE(collector_.GetUserInfoFromName("root", &uid, &gid));		EXPECT_TRUE(collector_.GetUserInfoFromName("root", &uid, &gid));
	EXPECT_EQ(0, uid);		EXPECT_EQ(0U, uid);
	EXPECT_EQ(0, gid);		EXPECT_EQ(0U, gid);
	}		}

	TEST_F(UserCollectorTest, CopyOffProcFilesBadPath) {		TEST_F(UserCollectorTest, CopyOffProcFilesBadPath) {
	@@ -387,7 +387,9 @@ TEST_F(UserCollectorTest, ValidateProcFiles) {

	// maps file is not empty		// maps file is not empty
	const char data[] = "test data";		const char data[] = "test data";
	ASSERT_EQ(sizeof(data), base::WriteFile(maps_file, data, sizeof(data)));		unsigned int numBytesWritten =
			base::WriteFile(maps_file, data, sizeof(data));
			ASSERT_EQ(sizeof(data), numBytesWritten);
	ASSERT_TRUE(base::PathExists(maps_file));		ASSERT_TRUE(base::PathExists(maps_file));
	EXPECT_TRUE(collector_.ValidateProcFiles(container_dir));		EXPECT_TRUE(collector_.ValidateProcFiles(container_dir));
	}		}