moved private member variables to .cc to reduce header file dependency

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1123 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/auth/unittest_ds.cc

@@ -41,20 +41,57 @@ using namespace isc::dns::rdata;
 namespace isc {
 namespace auth {
 
-TestDataSrc::TestDataSrc() : example("example.com"),
-                             sql1("sql1.example.com"),
-                             www_sql1("www.sql1.example.com"),
-                             www("www.example.com"),
-                             foo("foo.example.com"),
-                             dns01("dns01.example.com"),
-                             dns02("dns02.example.com"),
-                             dns03("dns03.example.com"),
-                             cnameint("cname-int.example.com"),
-                             cnameext("cname-ext.example.com"),
-                             dname("dname.example.com"),
-                             wild("*.wild.example.com"),
-                             subzone("subzone.example.com")
-{
+namespace {
+const Name example("example.com");
+const Name sql1("sql1.example.com");
+const Name www_sql1("www.sql1.example.com");
+const Name www("www.example.com");
+const Name foo("foo.example.com");
+const Name dns01("dns01.example.com");
+const Name dns02("dns02.example.com");
+const Name dns03("dns03.example.com");
+const Name cnameint("cname-int.example.com");
+const Name cnameext("cname-ext.example.com");
+const Name dname("dname.example.com");
+const Name wild("*.wild.example.com");
+const Name subzone("subzone.example.com");
+
+RRsetPtr example_ns;
+RRsetPtr example_soa;
+RRsetPtr example_nsec;
+RRsetPtr www_a;
+RRsetPtr www_nsec;
+RRsetPtr foo_cname;
+RRsetPtr foo_nsec;
+RRsetPtr cnameint_cname;
+RRsetPtr cnameint_nsec;
+RRsetPtr cnameext_cname;
+RRsetPtr cnameext_nsec;
+RRsetPtr dns01_a;
+RRsetPtr dns01_nsec;
+RRsetPtr dns02_a;
+RRsetPtr dns02_nsec;
+RRsetPtr dns03_a;
+RRsetPtr dns03_nsec;
+RRsetPtr wild_a;
+RRsetPtr wild_nsec;
+RRsetPtr dname_dname;
+RRsetPtr dname_nsec;
+RRsetPtr sql1_ns;
+RRsetPtr sql1_soa;
+RRsetPtr sql1_nsec;
+RRsetPtr sql1_ds;
+RRsetPtr sql1_ds_nsec;
+RRsetPtr www_sql1_a;
+RRsetPtr www_sql1_nsec;
+RRsetPtr subzone_ns;
+RRsetPtr subzone_nsec;
+RRsetPtr subzone_glue1;
+RRsetPtr subzone_glue2;
+RRsetPtr subzone_ds;
+}
+
+TestDataSrc::TestDataSrc() {
     RRset* rp;
     RRsetPtr rrsig;
 

src/lib/auth/unittest_ds.h

@@ -17,9 +17,6 @@
 #ifndef __TEST_DATA_SOURCE_H
 #define __TEST_DATA_SOURCE_H
 
-#include <dns/name.h>
-#include <dns/rrset.h>
-
 #include <gtest/gtest.h>
 
 #include "data_source.h"
@@ -27,6 +24,7 @@
 namespace isc {
 
 namespace dns {
+class Name;
 class RRClass;
 class RRType;
 class RRsetList;
@@ -101,53 +99,6 @@ private:
                      isc::dns::RRsetList& target,
                      const isc::dns::Name* zonename, const Mode mode,
                      uint32_t& flags) const;
-
-    const isc::dns::Name example;
-    const isc::dns::Name sql1;
-    const isc::dns::Name www_sql1;
-    const isc::dns::Name www;
-    const isc::dns::Name foo;
-    const isc::dns::Name dns01;
-    const isc::dns::Name dns02;
-    const isc::dns::Name dns03;
-    const isc::dns::Name cnameint;
-    const isc::dns::Name cnameext;
-    const isc::dns::Name dname;
-    const isc::dns::Name wild;
-    const isc::dns::Name subzone;
-    isc::dns::RRsetPtr example_ns;
-    isc::dns::RRsetPtr example_soa;
-    isc::dns::RRsetPtr example_nsec;
-    isc::dns::RRsetPtr www_a;
-    isc::dns::RRsetPtr www_nsec;
-    isc::dns::RRsetPtr foo_cname;
-    isc::dns::RRsetPtr foo_nsec;
-    isc::dns::RRsetPtr cnameint_cname;
-    isc::dns::RRsetPtr cnameint_nsec;
-    isc::dns::RRsetPtr cnameext_cname;
-    isc::dns::RRsetPtr cnameext_nsec;
-    isc::dns::RRsetPtr dns01_a;
-    isc::dns::RRsetPtr dns01_nsec;
-    isc::dns::RRsetPtr dns02_a;
-    isc::dns::RRsetPtr dns02_nsec;
-    isc::dns::RRsetPtr dns03_a;
-    isc::dns::RRsetPtr dns03_nsec;
-    isc::dns::RRsetPtr wild_a;
-    isc::dns::RRsetPtr wild_nsec;
-    isc::dns::RRsetPtr dname_dname;
-    isc::dns::RRsetPtr dname_nsec;
-    isc::dns::RRsetPtr sql1_ns;
-    isc::dns::RRsetPtr sql1_soa;
-    isc::dns::RRsetPtr sql1_nsec;
-    isc::dns::RRsetPtr sql1_ds;
-    isc::dns::RRsetPtr sql1_ds_nsec;
-    isc::dns::RRsetPtr www_sql1_a;
-    isc::dns::RRsetPtr www_sql1_nsec;
-    isc::dns::RRsetPtr subzone_ns;
-    isc::dns::RRsetPtr subzone_nsec;
-    isc::dns::RRsetPtr subzone_glue1;
-    isc::dns::RRsetPtr subzone_glue2;
-    isc::dns::RRsetPtr subzone_ds;
 };
 
 }