#include "config.h"
#endif
#include <boost/test/unit_test.hpp>
-#include "bindparserclasses.hh"
#include "misc.hh"
#include "pdnsexception.hh"
#include <utility>
-#include <boost/foreach.hpp>
+
#include <sstream>
#include <cstdlib>
+#include "dnsname.hh"
+#include "bindparserclasses.hh"
+#include "iputils.hh"
using std::string;
-BOOST_AUTO_TEST_SUITE(bindparser_cc)
+BOOST_AUTO_TEST_SUITE(test_bindparser_cc)
BOOST_AUTO_TEST_CASE(test_parser) {
const char *srcdir;
BOOST_CHECK_EQUAL(domains.size(), 11);
#define checkzone(i, dname, fname, ztype, nmasters) { \
- BOOST_CHECK_EQUAL(domains[i].name, #dname); \
+ BOOST_CHECK(domains[i].name == DNSName(#dname)); \
BOOST_CHECK_EQUAL(domains[i].filename, fname); \
BOOST_CHECK_EQUAL(domains[i].type, #ztype); \
BOOST_CHECK_EQUAL(domains[i].masters.size(), nmasters); \
checkzone(0, example.com, "./zones//example.com", master, 0);
checkzone(1, test.com, "./zones//test.com", slave, 1);
- BOOST_CHECK_EQUAL(domains[1].masters[0], "1.2.3.4:5678");
+ BOOST_CHECK_EQUAL(domains[1].masters[0].toString(), ComboAddress("1.2.3.4", 5678).toString());
checkzone(2, test.dyndns, "./zones//test.dyndns", garblewarble, 0);
checkzone(3, wtest.com, "./zones//wtest.com", master, 0);
checkzone(4, nztest.com, "./zones//nztest.com", master, 0);