}
BOOST_AUTO_TEST_CASE(test_xfrSvcParamKeyVals_multiple) {
- RecordTextReader rtr("key666=foobar echconfig=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\" ipv6hint=2001:db8::1 alpn=h2,h3 mandatory=alpn ipv4hint=192.0.2.1,192.0.2.2"); // out of order, resulting set should be in-order
+ RecordTextReader rtr("key666=foobar ech=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\" ipv6hint=2001:db8::1 alpn=h2,h3 mandatory=alpn ipv4hint=192.0.2.1,192.0.2.2"); // out of order, resulting set should be in-order
set<SvcParam> v;
rtr.xfrSvcParamKeyVals(v);
BOOST_CHECK_EQUAL(v.size(), 6U);
BOOST_CHECK(vit->getKey() == SvcParam::ipv4hint);
}
if (i == 3) {
- BOOST_CHECK(vit->getKey() == SvcParam::echconfig);
+ BOOST_CHECK(vit->getKey() == SvcParam::ech);
}
if (i == 4) {
BOOST_CHECK(vit->getKey() == SvcParam::ipv6hint);
string target;
RecordTextWriter rtw(target);
rtw.xfrSvcParamKeyVals(v);
- BOOST_CHECK_EQUAL(target, "mandatory=alpn alpn=h2,h3 ipv4hint=192.0.2.1,192.0.2.2 echconfig=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\" ipv6hint=2001:db8::1 key666=\"foobar\"");
+ BOOST_CHECK_EQUAL(target, "mandatory=alpn alpn=h2,h3 ipv4hint=192.0.2.1,192.0.2.2 ech=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\" ipv6hint=2001:db8::1 key666=\"foobar\"");
}
-BOOST_AUTO_TEST_CASE(test_xfrSvcParamKeyVals_echconfig) {
- string source("echconfig=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\"");
+BOOST_AUTO_TEST_CASE(test_xfrSvcParamKeyVals_ech) {
+ string source("ech=\"dG90YWxseSBib2d1cyBlY2hjb25maWcgdmFsdWU=\"");
RecordTextReader rtr(source);
set<SvcParam> v;
rtr.xfrSvcParamKeyVals(v);
BOOST_CHECK_EQUAL(v.size(), 1U);
auto k = v.begin()->getKey();
- BOOST_CHECK(k == SvcParam::echconfig);
- auto val = v.begin()->getEchConfig();
+ BOOST_CHECK(k == SvcParam::ech);
+ auto val = v.begin()->getECH();
BOOST_CHECK_EQUAL(val, "totally bogus echconfig value"); // decoded!
// Check the writer
BOOST_CHECK(k == 4);
BOOST_CHECK(k == SvcParam::ipv4hint);
- k = SvcParam::keyFromString("echconfig");
+ k = SvcParam::keyFromString("ech");
BOOST_CHECK(k == 5);
- BOOST_CHECK(k == SvcParam::echconfig);
+ BOOST_CHECK(k == SvcParam::ech);
k = SvcParam::keyFromString("ipv6hint");
BOOST_CHECK(k == 6);
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::no_default_alpn), "no-default-alpn");
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::port), "port");
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::ipv4hint), "ipv4hint");
- BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::echconfig), "echconfig");
+ BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::ech), "ech");
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::ipv6hint), "ipv6hint");
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::SvcParamKey(7)), "key7");
BOOST_CHECK_EQUAL(SvcParam::keyToString(SvcParam::SvcParamKey(666)), "key666");
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, val), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, val), std::invalid_argument);
- BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::echconfig, base64val));
- BOOST_CHECK_EQUAL(param.getEchConfig(), base64val);
+ BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::ech, base64val));
+ BOOST_CHECK_EQUAL(param.getECH(), base64val);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
BOOST_CHECK_THROW(param.getIPHints(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
// TODO test bad base64 value
- // BOOST_CHECK_THROW(SvcParam(SvcParam::echconfig, val), std::invalid_argument);
+ // BOOST_CHECK_THROW(SvcParam(SvcParam::ech, val), std::invalid_argument);
// Any string is allowed.....
BOOST_CHECK_NO_THROW(param = SvcParam(SvcParam::keyFromString("key666"), base64val));
BOOST_CHECK_EQUAL(param.getValue(), val);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getIPHints(), std::invalid_argument);
BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::no_default_alpn, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::port, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, std::move(val)), std::invalid_argument);
- BOOST_CHECK_THROW(SvcParam(SvcParam::echconfig, std::move(val)), std::invalid_argument);
+ BOOST_CHECK_THROW(SvcParam(SvcParam::ech, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, std::move(val)), std::invalid_argument);
set<string> mandatoryVal = {"alpn", "key666"};
auto retval = param.getMandatory();
BOOST_CHECK(retval == mandatoryExpected);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getIPHints(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::no_default_alpn, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::port, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, std::move(val)), std::invalid_argument);
- BOOST_CHECK_THROW(SvcParam(SvcParam::echconfig, std::move(val)), std::invalid_argument);
+ BOOST_CHECK_THROW(SvcParam(SvcParam::ech, std::move(val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, std::move(val)), std::invalid_argument);
SvcParam param;
BOOST_CHECK_EQUAL_COLLECTIONS(alpns.begin(), alpns.end(), checkVal.begin(), checkVal.end());
BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getIPHints(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::alpn, std::move(v4Val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::no_default_alpn, std::move(v4Val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::port, std::move(v4Val)), std::invalid_argument);
- BOOST_CHECK_THROW(SvcParam(SvcParam::echconfig, std::move(v4Val)), std::invalid_argument);
+ BOOST_CHECK_THROW(SvcParam(SvcParam::ech, std::move(v4Val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, std::move(v4Val)), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, std::move(v6Val)), std::invalid_argument);
BOOST_CHECK(retval == v4CheckVal);
BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
BOOST_CHECK(retval == v6CheckVal);
BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getPort(), std::invalid_argument);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
}
BOOST_CHECK_THROW(SvcParam(SvcParam::alpn, port), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::no_default_alpn, port), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv4hint, port), std::invalid_argument);
- BOOST_CHECK_THROW(SvcParam(SvcParam::echconfig, port), std::invalid_argument);
+ BOOST_CHECK_THROW(SvcParam(SvcParam::ech, port), std::invalid_argument);
BOOST_CHECK_THROW(SvcParam(SvcParam::ipv6hint, port), std::invalid_argument);
SvcParam param;
BOOST_CHECK_EQUAL(param.getPort(), port);
BOOST_CHECK_THROW(param.getMandatory(), std::invalid_argument);
BOOST_CHECK_THROW(param.getALPN(), std::invalid_argument);
- BOOST_CHECK_THROW(param.getEchConfig(), std::invalid_argument);
+ BOOST_CHECK_THROW(param.getECH(), std::invalid_argument);
BOOST_CHECK_THROW(param.getIPHints(), std::invalid_argument);
BOOST_CHECK_THROW(param.getValue(), std::invalid_argument);
}