Commit a5c7b7bb authored Jan 17, 2019 by Bernie Innocenti

Avoid multiple inheritance in ResolverTest

This is better modeled by an HAS-A relationship, and multiple
inheritance can cause a good deal of confusion. For instance, it wasn't
clear why GTest wouldn't call DnsResponderClient::SetUp() after deleting
ResolverTest::SetUp().

Test: atest resolv_integration_test
Change-Id: I69f5e53917a491f9d7035c0ff2399077f46e380c

parent 0a015535

dns_responder/dns_responder_client.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -65,10 +65,11 @@ public:
		void TearDownOemNetwork(int oemNetId);

		virtual void SetUp();

		virtual void TearDown();

		public:
		android::net::INetd* netdService() const { return mNetdSrv.get(); }

		private:
		android::sp<android::net::INetd> mNetdSrv = nullptr;
		int mOemNetId = -1;
		};

resolver_test.cpp

+135 −127

File changed.

Preview size limit exceeded, changes collapsed.