Updated unit tests after changing namespace handling

release/4.3a0
Richard Roberts 2012-07-17 17:38:31 +00:00
parent 10c5ebae73
commit 4bcc974cae
2 changed files with 16 additions and 6 deletions

View File

@ -3,6 +3,9 @@
#include <map> #include <map>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <ClassA.h>
#include <ClassB.h>
#include <ClassC.h>
#include <ClassD.h> #include <ClassD.h>
#include <path/to/ns1.h> #include <path/to/ns1.h>
#include <path/to/ns1/ClassB.h> #include <path/to/ns1/ClassB.h>

View File

@ -155,12 +155,19 @@ TEST( wrap, parse_namespaces ) {
Module module(header_path.c_str(), "testNamespaces",enable_verbose); Module module(header_path.c_str(), "testNamespaces",enable_verbose);
EXPECT_LONGS_EQUAL(6, module.classes.size()); EXPECT_LONGS_EQUAL(6, module.classes.size());
{
strvec module_exp_includes;
module_exp_includes += "path/to/ns1.h";
module_exp_includes += "path/to/ns2.h";
module_exp_includes += "path/to/ns3.h";
}
{ {
Class cls = module.classes.at(0); Class cls = module.classes.at(0);
EXPECT(assert_equal("ClassA", cls.name)); EXPECT(assert_equal("ClassA", cls.name));
strvec exp_namespaces; exp_namespaces += "ns1"; strvec exp_namespaces; exp_namespaces += "ns1";
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += "path/to/ns1.h", ""; strvec exp_includes; exp_includes;
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
@ -169,7 +176,7 @@ TEST( wrap, parse_namespaces ) {
EXPECT(assert_equal("ClassB", cls.name)); EXPECT(assert_equal("ClassB", cls.name));
strvec exp_namespaces; exp_namespaces += "ns1"; strvec exp_namespaces; exp_namespaces += "ns1";
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += "path/to/ns1.h", "path/to/ns1/ClassB.h"; strvec exp_includes; exp_includes += "path/to/ns1/ClassB.h";
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
@ -178,7 +185,7 @@ TEST( wrap, parse_namespaces ) {
EXPECT(assert_equal("ClassA", cls.name)); EXPECT(assert_equal("ClassA", cls.name));
strvec exp_namespaces; exp_namespaces += "ns2"; strvec exp_namespaces; exp_namespaces += "ns2";
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += "path/to/ns2.h", "path/to/ns2/ClassA.h"; strvec exp_includes; exp_includes += "path/to/ns2/ClassA.h";
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
@ -187,7 +194,7 @@ TEST( wrap, parse_namespaces ) {
EXPECT(assert_equal("ClassB", cls.name)); EXPECT(assert_equal("ClassB", cls.name));
strvec exp_namespaces; exp_namespaces += "ns2", "ns3"; strvec exp_namespaces; exp_namespaces += "ns2", "ns3";
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += "path/to/ns2.h", "path/to/ns3.h", ""; strvec exp_includes;
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
@ -196,7 +203,7 @@ TEST( wrap, parse_namespaces ) {
EXPECT(assert_equal("ClassC", cls.name)); EXPECT(assert_equal("ClassC", cls.name));
strvec exp_namespaces; exp_namespaces += "ns2"; strvec exp_namespaces; exp_namespaces += "ns2";
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += "path/to/ns2.h", ""; strvec exp_includes;
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
@ -205,7 +212,7 @@ TEST( wrap, parse_namespaces ) {
EXPECT(assert_equal("ClassD", cls.name)); EXPECT(assert_equal("ClassD", cls.name));
strvec exp_namespaces; strvec exp_namespaces;
EXPECT(assert_equal(exp_namespaces, cls.namespaces)); EXPECT(assert_equal(exp_namespaces, cls.namespaces));
strvec exp_includes; exp_includes += ""; strvec exp_includes;
EXPECT(assert_equal(exp_includes, cls.includes)); EXPECT(assert_equal(exp_includes, cls.includes));
} }
} }