diff options
Diffstat (limited to 'mDNSResponder/unittests')
-rw-r--r-- | mDNSResponder/unittests/mDNSCoreReceiveTest.c | 18 | ||||
-rw-r--r-- | mDNSResponder/unittests/mdns_ut.c | 9 | ||||
-rw-r--r-- | mDNSResponder/unittests/unittest_common.h | 2 |
3 files changed, 3 insertions, 26 deletions
diff --git a/mDNSResponder/unittests/mDNSCoreReceiveTest.c b/mDNSResponder/unittests/mDNSCoreReceiveTest.c index ece21407..856eb4ee 100644 --- a/mDNSResponder/unittests/mDNSCoreReceiveTest.c +++ b/mDNSResponder/unittests/mDNSCoreReceiveTest.c @@ -4,7 +4,6 @@ int InitmDNSCoreReceiveTest(void); int ValidQueryReqTest(void); int NullDstQueryReqTest(void); -int ReceiveArpLogMsgTest(void); void InitmDNSStorage(mDNS *const m); // This DNS message was gleaned from a uDNS query request packet that was captured with Wireshark. @@ -46,7 +45,6 @@ UNITTEST_HEADER(mDNSCoreReceiveTest) UNITTEST_TEST(InitmDNSCoreReceiveTest) UNITTEST_TEST(ValidQueryReqTest) UNITTEST_TEST(NullDstQueryReqTest) - UNITTEST_TEST(ReceiveArpLogMsgTest) UNITTEST_FOOTER UNITTEST_HEADER(InitmDNSCoreReceiveTest) @@ -56,16 +54,6 @@ UNITTEST_HEADER(InitmDNSCoreReceiveTest) mDNS_PacketLoggingEnabled = 0; UNITTEST_FOOTER -UNITTEST_HEADER(ReceiveArpLogMsgTest) - // Init unit test environment and verify no error occurred. - mStatus result = init_mdns_environment(mDNStrue); - UNITTEST_ASSERT(result == mStatus_NoError); - - UNITTEST_ASSERT(result == mStatus_NoError); - ArpLogMsgTest(&mDNSStorage, (const ARP_EthIP *) arp_request_packet, primary_interfaceID); - UNITTEST_ASSERT(result == mStatus_NoError); -UNITTEST_FOOTER - UNITTEST_HEADER(ValidQueryReqTest) mDNS *const m = &mDNSStorage; mDNSAddr srcaddr, dstaddr; @@ -73,9 +61,9 @@ UNITTEST_HEADER(ValidQueryReqTest) DNSMessage * msg; const mDNSu8 * end; - // This test case does not require setup of interfaces, the record's cache, or pending questions - // so m is initialized to all zeros. - InitmDNSStorage(m); + // Init unit test environment and verify no error occurred. + mStatus result = init_mdns_environment(mDNStrue); + UNITTEST_ASSERT(result == mStatus_NoError); // Used random values for srcaddr and srcport srcaddr.type = mDNSAddrType_IPv4; diff --git a/mDNSResponder/unittests/mdns_ut.c b/mDNSResponder/unittests/mdns_ut.c index 907cfa69..0384d2c1 100644 --- a/mDNSResponder/unittests/mdns_ut.c +++ b/mDNSResponder/unittests/mdns_ut.c @@ -6,12 +6,3 @@ mDNSexport mStatus mDNS_InitStorage_ut(mDNS *const m, mDNS_PlatformSupport *cons { return mDNS_InitStorage(m, p, rrcachestorage, rrcachesize, AdvertiseLocalAddresses, Callback, Context); } - -mDNSexport mStatus ArpLogMsgTest(mDNS *const m, const ARP_EthIP *const arp, const mDNSInterfaceID InterfaceID) -{ - NetworkInterfaceInfo *intf = FirstInterfaceForID(m, InterfaceID); - static const char msg[] = "ARP Req message"; - LogMsg("Arp %-7s %s %.6a %.4a for %.4a", - intf->ifname, msg, arp->sha.b, arp->spa.b, arp->tpa.b); - return mStatus_NoError; -} diff --git a/mDNSResponder/unittests/unittest_common.h b/mDNSResponder/unittests/unittest_common.h index a4af2e67..4b62bb95 100644 --- a/mDNSResponder/unittests/unittest_common.h +++ b/mDNSResponder/unittests/unittest_common.h @@ -51,7 +51,5 @@ extern int LogEtcHosts_ut(mDNS *const m); extern mDNSBool mDNSMacOSXCreateEtcHostsEntry_ut(const domainname *domain, const struct sockaddr *sa, const domainname *cname, char *ifname, AuthHash *auth); extern void UpdateEtcHosts_ut(void *context); -extern mStatus ArpLogMsgTest(mDNS *const m, const ARP_EthIP *const arp, const mDNSInterfaceID InterfaceID); - #endif /* UNITTEST_COMMON_H */ |