Browse Source

moved unit test related files to tests/ as we agreed in the f2f week.

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/jinmei-dnsrdata2@742 e5f2f494-b856-4b98-b285-d166d9295462
JINMEI Tatuya 15 years ago
parent
commit
6582726397
52 changed files with 54 additions and 75 deletions
  1. 1 0
      configure.ac
  2. 1 1
      src/lib/dns/Makefile.am
  3. 1 23
      src/lib/dns/cpp/Makefile.am
  4. 1 1
      src/lib/dns/cpp/base64_unittest.cc
  5. 1 1
      src/lib/dns/cpp/buffer_unittest.cc
  6. 8 8
      src/lib/dns/cpp/message_unittest.cc
  7. 3 3
      src/lib/dns/cpp/messagerenderer_unittest.cc
  8. 3 3
      src/lib/dns/cpp/name_unittest.cc
  9. 6 6
      src/lib/dns/cpp/question_unittest.cc
  10. 6 6
      src/lib/dns/cpp/rdata_unittest.cc
  11. 3 3
      src/lib/dns/cpp/rrclass_unittest.cc
  12. 3 3
      src/lib/dns/cpp/rrparamregistry_unittest.cc
  13. 9 9
      src/lib/dns/cpp/rrset_unittest.cc
  14. 3 3
      src/lib/dns/cpp/rrttl_unittest.cc
  15. 3 3
      src/lib/dns/cpp/rrtype_unittest.cc
  16. 0 0
      src/lib/dns/cpp/tests/run_unittests.cc
  17. 0 0
      src/lib/dns/cpp/tests/testdata/message_fromWire1
  18. 0 0
      src/lib/dns/cpp/tests/testdata/message_toWire1
  19. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire1
  20. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire10
  21. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire11
  22. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire12
  23. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire13
  24. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire14
  25. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire2
  26. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire3_1
  27. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire3_2
  28. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire4
  29. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire6
  30. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire7
  31. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire8
  32. 0 0
      src/lib/dns/cpp/tests/testdata/name_fromWire9
  33. 0 0
      src/lib/dns/cpp/tests/testdata/name_toWire1
  34. 0 0
      src/lib/dns/cpp/tests/testdata/name_toWire2
  35. 0 0
      src/lib/dns/cpp/tests/testdata/name_toWire3
  36. 0 0
      src/lib/dns/cpp/tests/testdata/name_toWire4
  37. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_cname_fromWire
  38. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_in_a_fromWire
  39. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_in_aaaa_fromWire
  40. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_mx_fromWire
  41. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_mx_toWire1
  42. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_ns_fromWire
  43. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_soa_fromWire
  44. 0 0
      src/lib/dns/cpp/tests/testdata/rdata_txt_fromWire
  45. 0 0
      src/lib/dns/cpp/tests/testdata/rrcode16_fromWire1
  46. 0 0
      src/lib/dns/cpp/tests/testdata/rrcode16_fromWire2
  47. 0 0
      src/lib/dns/cpp/tests/testdata/rrcode32_fromWire1
  48. 0 0
      src/lib/dns/cpp/tests/testdata/rrcode32_fromWire2
  49. 0 0
      src/lib/dns/cpp/tests/testdata/rrset_toWire1
  50. 0 0
      src/lib/dns/cpp/tests/testdata/rrset_toWire2
  51. 1 1
      src/lib/dns/cpp/unittest_util.cc
  52. 1 1
      src/lib/dns/cpp/unittest_util.h

+ 1 - 0
configure.ac

@@ -163,6 +163,7 @@ AC_CONFIG_FILES([Makefile
                  src/lib/config/python/isc/config/Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/cpp/Makefile
+                 src/lib/dns/cpp/tests/Makefile
                  src/lib/exceptions/cpp/Makefile
                  src/lib/exceptions/Makefile
                  src/lib/auth/Makefile

+ 1 - 1
src/lib/dns/Makefile.am

@@ -1 +1 @@
-SUBDIRS = cpp
+SUBDIRS = cpp cpp/tests

+ 1 - 23
src/lib/dns/cpp/Makefile.am

@@ -22,26 +22,4 @@ rrtype.h: rrtype-placeholder.h
 rrparamregistry.cc: rrparamregistry-placeholder.cc
 rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: Makefile
 	./gen-rdatacode.py
-
-TESTS =
-if HAVE_GTEST
-TESTS += run_unittests
-run_unittests_SOURCES = unittest_util.h unittest_util.cc
-run_unittests_SOURCES += buffer_unittest.cc name_unittest.cc
-run_unittests_SOURCES += messagerenderer_unittest.cc
-run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
-run_unittests_SOURCES += rrttl_unittest.cc
-run_unittests_SOURCES += rdata_unittest.cc
-run_unittests_SOURCES += rrset_unittest.cc
-run_unittests_SOURCES += question_unittest.cc
-run_unittests_SOURCES += rrparamregistry_unittest.cc
-run_unittests_SOURCES += message_unittest.cc
-run_unittests_SOURCES += base64_unittest.cc
-run_unittests_SOURCES += run_unittests.cc
-run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-run_unittests_LDADD = .libs/libdns.a $(GTEST_LDADD)
-run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
-endif
-
-noinst_PROGRAMS = $(TESTS)
+tests: libdns.la

+ 1 - 1
src/lib/dns/cpp/base64_unittest.cc

@@ -18,7 +18,7 @@
 #include <utility>
 #include <vector>
 
-#include "base64.h"
+#include <dns/base64.h>
 
 #include <gtest/gtest.h>
 

+ 1 - 1
src/lib/dns/cpp/buffer_unittest.cc

@@ -14,7 +14,7 @@
 
 // $Id$
 
-#include "buffer.h"
+#include <dns/buffer.h>
 
 #include <gtest/gtest.h>
 

+ 8 - 8
src/lib/dns/cpp/message_unittest.cc

@@ -14,14 +14,14 @@
 
 // $Id$
 
-#include "buffer.h"
-#include "message.h"
-#include "messagerenderer.h"
-#include "question.h"
-#include "rdataclass.h"
-#include "rrclass.h"
-#include "rrttl.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/message.h>
+#include <dns/messagerenderer.h>
+#include <dns/question.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/rrtype.h>
 
 #include <gtest/gtest.h>
 

+ 3 - 3
src/lib/dns/cpp/messagerenderer_unittest.cc

@@ -16,9 +16,9 @@
 
 #include <vector>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 #include "unittest_util.h"
 

+ 3 - 3
src/lib/dns/cpp/name_unittest.cc

@@ -20,9 +20,9 @@
 #include <iomanip>
 #include <stdexcept>
 
-#include "buffer.h"
-#include "name.h"
-#include "messagerenderer.h"
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/messagerenderer.h>
 
 #include "unittest_util.h"
 

+ 6 - 6
src/lib/dns/cpp/question_unittest.cc

@@ -14,12 +14,12 @@
 
 // $Id$
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "question.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 #include <gtest/gtest.h>
 

+ 6 - 6
src/lib/dns/cpp/rdata_unittest.cc

@@ -16,12 +16,12 @@
 
 #include <vector>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "rrclass.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 #include <gtest/gtest.h>
 

+ 3 - 3
src/lib/dns/cpp/rrclass_unittest.cc

@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rrclass.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrclass.h>
 
 #include "unittest_util.h"
 

+ 3 - 3
src/lib/dns/cpp/rrparamregistry_unittest.cc

@@ -21,9 +21,9 @@
 
 #include <gtest/gtest.h>
 
-#include "rrclass.h"
-#include "rrparamregistry.h"
-#include "rrtype.h"
+#include <dns/rrclass.h>
+#include <dns/rrparamregistry.h>
+#include <dns/rrtype.h>
 
 using namespace std;
 using namespace isc::dns;

+ 9 - 9
src/lib/dns/cpp/rrset_unittest.cc

@@ -14,15 +14,15 @@
 
 // $Id$
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "name.h"
-#include "rdata.h"
-#include "rdataclass.h"
-#include "rrclass.h"
-#include "rrtype.h"
-#include "rrttl.h"
-#include "rrset.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 #include <gtest/gtest.h>
 

+ 3 - 3
src/lib/dns/cpp/rrttl_unittest.cc

@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rrttl.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrttl.h>
 
 #include "unittest_util.h"
 

+ 3 - 3
src/lib/dns/cpp/rrtype_unittest.cc

@@ -16,9 +16,9 @@
 
 #include <gtest/gtest.h>
 
-#include "buffer.h"
-#include "messagerenderer.h"
-#include "rrtype.h"
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrtype.h>
 
 #include "unittest_util.h"
 

src/lib/dns/cpp/run_unittests.cc → src/lib/dns/cpp/tests/run_unittests.cc


src/lib/dns/cpp/testdata/message_fromWire1 → src/lib/dns/cpp/tests/testdata/message_fromWire1


src/lib/dns/cpp/testdata/message_toWire1 → src/lib/dns/cpp/tests/testdata/message_toWire1


src/lib/dns/cpp/testdata/name_fromWire1 → src/lib/dns/cpp/tests/testdata/name_fromWire1


src/lib/dns/cpp/testdata/name_fromWire10 → src/lib/dns/cpp/tests/testdata/name_fromWire10


src/lib/dns/cpp/testdata/name_fromWire11 → src/lib/dns/cpp/tests/testdata/name_fromWire11


src/lib/dns/cpp/testdata/name_fromWire12 → src/lib/dns/cpp/tests/testdata/name_fromWire12


src/lib/dns/cpp/testdata/name_fromWire13 → src/lib/dns/cpp/tests/testdata/name_fromWire13


src/lib/dns/cpp/testdata/name_fromWire14 → src/lib/dns/cpp/tests/testdata/name_fromWire14


src/lib/dns/cpp/testdata/name_fromWire2 → src/lib/dns/cpp/tests/testdata/name_fromWire2


src/lib/dns/cpp/testdata/name_fromWire3_1 → src/lib/dns/cpp/tests/testdata/name_fromWire3_1


src/lib/dns/cpp/testdata/name_fromWire3_2 → src/lib/dns/cpp/tests/testdata/name_fromWire3_2


src/lib/dns/cpp/testdata/name_fromWire4 → src/lib/dns/cpp/tests/testdata/name_fromWire4


src/lib/dns/cpp/testdata/name_fromWire6 → src/lib/dns/cpp/tests/testdata/name_fromWire6


src/lib/dns/cpp/testdata/name_fromWire7 → src/lib/dns/cpp/tests/testdata/name_fromWire7


src/lib/dns/cpp/testdata/name_fromWire8 → src/lib/dns/cpp/tests/testdata/name_fromWire8


src/lib/dns/cpp/testdata/name_fromWire9 → src/lib/dns/cpp/tests/testdata/name_fromWire9


src/lib/dns/cpp/testdata/name_toWire1 → src/lib/dns/cpp/tests/testdata/name_toWire1


src/lib/dns/cpp/testdata/name_toWire2 → src/lib/dns/cpp/tests/testdata/name_toWire2


src/lib/dns/cpp/testdata/name_toWire3 → src/lib/dns/cpp/tests/testdata/name_toWire3


src/lib/dns/cpp/testdata/name_toWire4 → src/lib/dns/cpp/tests/testdata/name_toWire4


src/lib/dns/cpp/testdata/rdata_cname_fromWire → src/lib/dns/cpp/tests/testdata/rdata_cname_fromWire


src/lib/dns/cpp/testdata/rdata_in_a_fromWire → src/lib/dns/cpp/tests/testdata/rdata_in_a_fromWire


src/lib/dns/cpp/testdata/rdata_in_aaaa_fromWire → src/lib/dns/cpp/tests/testdata/rdata_in_aaaa_fromWire


src/lib/dns/cpp/testdata/rdata_mx_fromWire → src/lib/dns/cpp/tests/testdata/rdata_mx_fromWire


src/lib/dns/cpp/testdata/rdata_mx_toWire1 → src/lib/dns/cpp/tests/testdata/rdata_mx_toWire1


src/lib/dns/cpp/testdata/rdata_ns_fromWire → src/lib/dns/cpp/tests/testdata/rdata_ns_fromWire


src/lib/dns/cpp/testdata/rdata_soa_fromWire → src/lib/dns/cpp/tests/testdata/rdata_soa_fromWire


src/lib/dns/cpp/testdata/rdata_txt_fromWire → src/lib/dns/cpp/tests/testdata/rdata_txt_fromWire


src/lib/dns/cpp/testdata/rrcode16_fromWire1 → src/lib/dns/cpp/tests/testdata/rrcode16_fromWire1


src/lib/dns/cpp/testdata/rrcode16_fromWire2 → src/lib/dns/cpp/tests/testdata/rrcode16_fromWire2


src/lib/dns/cpp/testdata/rrcode32_fromWire1 → src/lib/dns/cpp/tests/testdata/rrcode32_fromWire1


src/lib/dns/cpp/testdata/rrcode32_fromWire2 → src/lib/dns/cpp/tests/testdata/rrcode32_fromWire2


src/lib/dns/cpp/testdata/rrset_toWire1 → src/lib/dns/cpp/tests/testdata/rrset_toWire1


src/lib/dns/cpp/testdata/rrset_toWire2 → src/lib/dns/cpp/tests/testdata/rrset_toWire2


+ 1 - 1
src/lib/dns/cpp/unittest_util.cc

@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 
-#include "name.h"
+#include <dns/name.h>
 #include "unittest_util.h"
 
 using isc::UnitTestUtil;

+ 1 - 1
src/lib/dns/cpp/unittest_util.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include <string>
 
-#include "name.h"
+#include <dns/name.h>
 
 #include <gtest/gtest.h>