From fb69c5a354122786c52c6589e409a048350f8989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 30 Sep 2024 13:51:05 +0200 Subject: [PATCH] tst_QDnsLookup::lookupReuse(): Rewrite using lookupCommon helper Task-number: QTBUG-129335 Change-Id: I8417ff9e76076d0b1a40270edc1b2692a122657f Reviewed-by: Thiago Macieira (cherry picked from commit 41768db300b70dda36344ab1cafb6b99937da435) Reviewed-by: Qt Cherry-pick Bot --- .../kernel/qdnslookup/tst_qdnslookup.cpp | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp index af3a74a498a..1d120cf6682 100644 --- a/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp +++ b/tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp @@ -565,28 +565,23 @@ void tst_QDnsLookup::lookupIdn() void tst_QDnsLookup::lookupReuse() { - QDnsLookup lookup; - // first lookup - lookup.setType(QDnsLookup::A); - lookup.setName(domainName("a-single")); - lookup.lookup(); - QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout); + std::unique_ptr lookup = lookupCommon(QDnsLookup::Type::A, "a-single"); - QCOMPARE(int(lookup.error()), int(QDnsLookup::NoError)); - QVERIFY(!lookup.hostAddressRecords().isEmpty()); - QCOMPARE(lookup.hostAddressRecords().first().name(), domainName("a-single")); - QCOMPARE(lookup.hostAddressRecords().first().value(), QHostAddress("192.0.2.1")); + QCOMPARE(lookup->error(), QDnsLookup::NoError); + QVERIFY(!lookup->hostAddressRecords().isEmpty()); + QCOMPARE(lookup->hostAddressRecords().first().name(), domainName("a-single")); + QCOMPARE(lookup->hostAddressRecords().first().value(), QHostAddress("192.0.2.1")); // second lookup - lookup.setType(QDnsLookup::AAAA); - lookup.setName(domainName("aaaa-single")); - lookup.lookup(); - QTRY_VERIFY_WITH_TIMEOUT(lookup.isFinished(), Timeout); - QCOMPARE(int(lookup.error()), int(QDnsLookup::NoError)); - QVERIFY(!lookup.hostAddressRecords().isEmpty()); - QCOMPARE(lookup.hostAddressRecords().first().name(), domainName("aaaa-single")); - QCOMPARE(lookup.hostAddressRecords().first().value(), QHostAddress("2001:db8::1")); + lookup->setType(QDnsLookup::AAAA); + lookup->setName(domainName("aaaa-single")); + lookup->lookup(); + QTRY_VERIFY_WITH_TIMEOUT(lookup->isFinished(), Timeout); + QCOMPARE(lookup->error(), QDnsLookup::NoError); + QVERIFY(!lookup->hostAddressRecords().isEmpty()); + QCOMPARE(lookup->hostAddressRecords().first().name(), domainName("aaaa-single")); + QCOMPARE(lookup->hostAddressRecords().first().value(), QHostAddress("2001:db8::1")); }