Merge "Update unit tests to use new socket schema" into rvc-dev (0810d57f) · Commits · e / os / android_frameworks_base

cmds/statsd/tests/metrics/EventMetricProducer_test.cpp

+101 −51

Original line number	Original line	Diff line number	Diff line
	@@ -13,14 +13,17 @@
	// limitations under the License.		// limitations under the License.

	#include "src/metrics/EventMetricProducer.h"		#include "src/metrics/EventMetricProducer.h"
	#include "metrics_test_helper.h"
	#include "tests/statsd_test_util.h"

	#include <gmock/gmock.h>		#include <gmock/gmock.h>
	#include <gtest/gtest.h>		#include <gtest/gtest.h>
	#include <stdio.h>		#include <stdio.h>

	#include <vector>		#include <vector>

			#include "metrics_test_helper.h"
			#include "stats_event.h"
			#include "tests/statsd_test_util.h"

	using namespace testing;		using namespace testing;
	using android::sp;		using android::sp;
	using std::set;		using std::set;
	@@ -35,6 +38,22 @@ namespace statsd {

	const ConfigKey kConfigKey(0, 12345);		const ConfigKey kConfigKey(0, 12345);

			namespace {
			void makeLogEvent(LogEvent* logEvent, int32_t atomId, int64_t timestampNs, string str) {
			AStatsEvent* statsEvent = AStatsEvent_obtain();
			AStatsEvent_setAtomId(statsEvent, atomId);
			AStatsEvent_overwriteTimestamp(statsEvent, timestampNs);

			AStatsEvent_writeString(statsEvent, str.c_str());
			AStatsEvent_build(statsEvent);

			size_t size;
			uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);
			logEvent->parseBuffer(buf, size);
			AStatsEvent_release(statsEvent);
			}
			} // anonymous namespace

	TEST(EventMetricProducerTest, TestNoCondition) {		TEST(EventMetricProducerTest, TestNoCondition) {
	int64_t bucketStartTimeNs = 10000000000;		int64_t bucketStartTimeNs = 10000000000;
	int64_t eventStartTimeNs = bucketStartTimeNs + 1;		int64_t eventStartTimeNs = bucketStartTimeNs + 1;
	@@ -43,8 +62,11 @@ TEST(EventMetricProducerTest, TestNoCondition) {
	EventMetric metric;		EventMetric metric;
	metric.set_id(1);		metric.set_id(1);

	LogEvent event1(1 /tag id/, bucketStartTimeNs + 1);		LogEvent event1(/uid=/0, /pid=/0);
	LogEvent event2(1 /tag id/, bucketStartTimeNs + 2);		CreateNoValuesLogEvent(&event1, 1 /tagId/, bucketStartTimeNs + 1);

			LogEvent event2(/uid=/0, /pid=/0);
			CreateNoValuesLogEvent(&event2, 1 /tagId/, bucketStartTimeNs + 2);

	sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();		sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();

	@@ -54,8 +76,17 @@ TEST(EventMetricProducerTest, TestNoCondition) {
	eventProducer.onMatchedLogEvent(1 /matcher index/, event1);		eventProducer.onMatchedLogEvent(1 /matcher index/, event1);
	eventProducer.onMatchedLogEvent(1 /matcher index/, event2);		eventProducer.onMatchedLogEvent(1 /matcher index/, event2);

	// TODO(b/110561136): get the report and check the content after the ProtoOutputStream change		// Check dump report content.
	// is done eventProducer.onDumpReport();		ProtoOutputStream output;
			std::set<string> strSet;
			eventProducer.onDumpReport(bucketStartTimeNs + 20, true /include current partial bucket/,
			true /erase data/, FAST, &strSet, &output);

			StatsLogReport report = outputStreamToProto(&output);
			EXPECT_TRUE(report.has_event_metrics());
			EXPECT_EQ(2, report.event_metrics().data_size());
			EXPECT_EQ(bucketStartTimeNs + 1, report.event_metrics().data(0).elapsed_timestamp_nanos());
			EXPECT_EQ(bucketStartTimeNs + 2, report.event_metrics().data(1).elapsed_timestamp_nanos());
	}		}

	TEST(EventMetricProducerTest, TestEventsWithNonSlicedCondition) {		TEST(EventMetricProducerTest, TestEventsWithNonSlicedCondition) {
	@@ -67,8 +98,11 @@ TEST(EventMetricProducerTest, TestEventsWithNonSlicedCondition) {
	metric.set_id(1);		metric.set_id(1);
	metric.set_condition(StringToId("SCREEN_ON"));		metric.set_condition(StringToId("SCREEN_ON"));

	LogEvent event1(1, bucketStartTimeNs + 1);		LogEvent event1(/uid=/0, /pid=/0);
	LogEvent event2(1, bucketStartTimeNs + 10);		CreateNoValuesLogEvent(&event1, 1 /tagId/, bucketStartTimeNs + 1);

			LogEvent event2(/uid=/0, /pid=/0);
			CreateNoValuesLogEvent(&event2, 1 /tagId/, bucketStartTimeNs + 10);

	sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();		sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();

	@@ -81,51 +115,67 @@ TEST(EventMetricProducerTest, TestEventsWithNonSlicedCondition) {

	eventProducer.onMatchedLogEvent(1 /matcher index/, event2);		eventProducer.onMatchedLogEvent(1 /matcher index/, event2);

	// TODO: get the report and check the content after the ProtoOutputStream change is done.		// Check dump report content.
	// eventProducer.onDumpReport();		ProtoOutputStream output;
			std::set<string> strSet;
			eventProducer.onDumpReport(bucketStartTimeNs + 20, true /include current partial bucket/,
			true /erase data/, FAST, &strSet, &output);

			StatsLogReport report = outputStreamToProto(&output);
			EXPECT_TRUE(report.has_event_metrics());
			EXPECT_EQ(1, report.event_metrics().data_size());
			EXPECT_EQ(bucketStartTimeNs + 1, report.event_metrics().data(0).elapsed_timestamp_nanos());
	}		}

	// TODO(b/149590301): Update this test to use new socket schema.		TEST(EventMetricProducerTest, TestEventsWithSlicedCondition) {
	//TEST(EventMetricProducerTest, TestEventsWithSlicedCondition) {		int64_t bucketStartTimeNs = 10000000000;
	// int64_t bucketStartTimeNs = 10000000000;		int64_t bucketSizeNs = 30 * 1000 * 1000 * 1000LL;
	// int64_t bucketSizeNs = 30 * 1000 * 1000 * 1000LL;
	//		int tagId = 1;
	// int tagId = 1;		int conditionTagId = 2;
	// int conditionTagId = 2;
	//		EventMetric metric;
	// EventMetric metric;		metric.set_id(1);
	// metric.set_id(1);		metric.set_condition(StringToId("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON"));
	// metric.set_condition(StringToId("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON"));		MetricConditionLink* link = metric.add_links();
	// MetricConditionLink* link = metric.add_links();		link->set_condition(StringToId("APP_IN_BACKGROUND_PER_UID"));
	// link->set_condition(StringToId("APP_IN_BACKGROUND_PER_UID"));		buildSimpleAtomFieldMatcher(tagId, 1, link->mutable_fields_in_what());
	// buildSimpleAtomFieldMatcher(tagId, 1, link->mutable_fields_in_what());		buildSimpleAtomFieldMatcher(conditionTagId, 2, link->mutable_fields_in_condition());
	// buildSimpleAtomFieldMatcher(conditionTagId, 2, link->mutable_fields_in_condition());
	//		LogEvent event1(/uid=/0, /pid=/0);
	// LogEvent event1(tagId, bucketStartTimeNs + 1);		makeLogEvent(&event1, 1 /tagId/, bucketStartTimeNs + 1, "111");
	// EXPECT_TRUE(event1.write("111"));		ConditionKey key1;
	// event1.init();		key1[StringToId("APP_IN_BACKGROUND_PER_UID")] = {
	// ConditionKey key1;		getMockedDimensionKey(conditionTagId, 2, "111")};
	// key1[StringToId("APP_IN_BACKGROUND_PER_UID")] = {getMockedDimensionKey(conditionTagId, 2, "111")};
	//		LogEvent event2(/uid=/0, /pid=/0);
	// LogEvent event2(tagId, bucketStartTimeNs + 10);		makeLogEvent(&event2, 1 /tagId/, bucketStartTimeNs + 10, "222");
	// EXPECT_TRUE(event2.write("222"));		ConditionKey key2;
	// event2.init();		key2[StringToId("APP_IN_BACKGROUND_PER_UID")] = {
	// ConditionKey key2;		getMockedDimensionKey(conditionTagId, 2, "222")};
	// key2[StringToId("APP_IN_BACKGROUND_PER_UID")] = {getMockedDimensionKey(conditionTagId, 2, "222")};
	//		sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();
	// sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>();		// Condition is false for first event.
	// EXPECT_CALL(*wizard, query(_, key1, _)).WillOnce(Return(ConditionState::kFalse));		EXPECT_CALL(*wizard, query(_, key1, _)).WillOnce(Return(ConditionState::kFalse));
	//		// Condition is true for second event.
	// EXPECT_CALL(*wizard, query(_, key2, _)).WillOnce(Return(ConditionState::kTrue));		EXPECT_CALL(*wizard, query(_, key2, _)).WillOnce(Return(ConditionState::kTrue));
	//
	// EventMetricProducer eventProducer(kConfigKey, metric, 1, wizard, bucketStartTimeNs);		EventMetricProducer eventProducer(kConfigKey, metric, 1, wizard, bucketStartTimeNs);
	//
	// eventProducer.onMatchedLogEvent(1 /matcher index/, event1);		eventProducer.onMatchedLogEvent(1 /matcher index/, event1);
	// eventProducer.onMatchedLogEvent(1 /matcher index/, event2);		eventProducer.onMatchedLogEvent(1 /matcher index/, event2);
	//
	// // TODO: get the report and check the content after the ProtoOutputStream change is done.		// Check dump report content.
	// // eventProducer.onDumpReport();		ProtoOutputStream output;
	//}		std::set<string> strSet;
			eventProducer.onDumpReport(bucketStartTimeNs + 20, true /include current partial bucket/,
			true /erase data/, FAST, &strSet, &output);

			StatsLogReport report = outputStreamToProto(&output);
			EXPECT_TRUE(report.has_event_metrics());
			EXPECT_EQ(1, report.event_metrics().data_size());
			EXPECT_EQ(bucketStartTimeNs + 10, report.event_metrics().data(0).elapsed_timestamp_nanos());
			}

	} // namespace statsd		} // namespace statsd
	} // namespace os		} // namespace os

cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp

+702 −763

File changed.

Preview size limit exceeded, changes collapsed.

cmds/statsd/tests/statsd_test_util.cpp

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -428,7 +428,7 @@ shared_ptr<LogEvent> CreateTwoValueLogEvent(int atomId, int64_t eventTimeNs, int

	return logEvent;		return logEvent;
	}		}
	//
	void CreateTwoValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,		void CreateTwoValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,
	int32_t value2) {		int32_t value2) {
	AStatsEvent* statsEvent = AStatsEvent_obtain();		AStatsEvent* statsEvent = AStatsEvent_obtain();
	@@ -531,6 +531,18 @@ shared_ptr<LogEvent> CreateNoValuesLogEvent(int atomId, int64_t eventTimeNs) {
	return logEvent;		return logEvent;
	}		}

			void CreateNoValuesLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs) {
			AStatsEvent* statsEvent = AStatsEvent_obtain();
			AStatsEvent_setAtomId(statsEvent, atomId);
			AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);
			AStatsEvent_build(statsEvent);

			size_t size;
			uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);
			logEvent->parseBuffer(buf, size);
			AStatsEvent_release(statsEvent);
			}

	std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(		std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(
	uint64_t timestampNs, const android::view::DisplayStateEnum state) {		uint64_t timestampNs, const android::view::DisplayStateEnum state) {
	AStatsEvent* statsEvent = AStatsEvent_obtain();		AStatsEvent* statsEvent = AStatsEvent_obtain();

cmds/statsd/tests/statsd_test_util.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -187,6 +187,8 @@ void CreateRepeatedValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTi

	std::shared_ptr<LogEvent> CreateNoValuesLogEvent(int atomId, int64_t eventTimeNs);		std::shared_ptr<LogEvent> CreateNoValuesLogEvent(int atomId, int64_t eventTimeNs);

			void CreateNoValuesLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs);

	// Create log event for screen state changed.		// Create log event for screen state changed.
	std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(		std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(
	uint64_t timestampNs, const android::view::DisplayStateEnum state);		uint64_t timestampNs, const android::view::DisplayStateEnum state);