X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fcollection.cpp;h=41dc7e482543ccaa31bc3e9346addab68ddcec34;hb=17608ed08bfee40cdc3da19d5a1a2dc77410578f;hp=bb72c03fbba536f3cce42cf6cfdea6e52c9f45ba;hpb=57dc9929879076398467ae16d349cd0d453737fe;p=libs%2Fdatafile.git

diff --git a/tests/collection.cpp b/tests/collection.cpp
index bb72c03..41dc7e4 100644
--- a/tests/collection.cpp
+++ b/tests/collection.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include <msp/datafile/collection.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/io/memory.h>
@@ -21,6 +22,10 @@ public:
 
 private:
 	void load();
+	void contains();
+	void contains_future();
+	void names();
+	void names_future();
 	void fetch();
 	void nonexistent();
 	void type_mismatch();
@@ -28,6 +33,7 @@ private:
 	void name_collision();
 };
 
+
 class Base
 {
 public:
@@ -47,7 +53,15 @@ public:
 };
 
 class Foo: public Base
-{ };
+{
+private:
+	static unsigned create_count;
+
+public:
+	Foo();
+
+	static unsigned get_create_count() { return create_count; }
+};
 
 class Bar: public Base
 { };
@@ -55,8 +69,21 @@ class Bar: public Base
 class Sub: public Bar
 { };
 
+
+class TestSource: public DataFile::CollectionSource
+{
+public:
+	virtual bool is_loadable(const DataFile::CollectionItemTypeBase &, const std::string &) const;
+	virtual NameList get_names(const DataFile::CollectionItemTypeBase &) const;
+	virtual void load(DataFile::Collection &, const DataFile::CollectionItemTypeBase &, const std::string &) const;
+};
+
+
 class TestCollection: public DataFile::Collection
 {
+private:
+	TestSource source;
+
 public:
 	TestCollection();
 
@@ -64,9 +91,14 @@ private:
 	Foo *create_foo(const string &);
 };
 
+
 CollectionTests::CollectionTests()
 {
 	add(&CollectionTests::load, "Load objects");
+	add(&CollectionTests::contains, "Containment test");
+	add(&CollectionTests::contains_future, "Future containment test");
+	add(&CollectionTests::names, "List object names");
+	add(&CollectionTests::names_future, "List future object names");
 	add(&CollectionTests::fetch, "Fetch objects");
 	add(&CollectionTests::nonexistent, "Nonexistent object").expect_throw<key_error>();
 	add(&CollectionTests::type_mismatch, "Type mismatch").expect_throw<Msp::type_mismatch>();
@@ -95,6 +127,39 @@ void CollectionTests::load()
 	loader.load(parser);
 }
 
+void CollectionTests::contains()
+{
+	const TestCollection *ccoll = collection;
+	EXPECT(ccoll->contains<Foo>("a"));
+	EXPECT(ccoll->contains<Bar>("c"));
+	EXPECT(!ccoll->contains<Foo>("c"));
+}
+
+void CollectionTests::contains_future()
+{
+	const TestCollection *ccoll = collection;
+	EXPECT(!ccoll->contains<Foo>("f"));
+	EXPECT(collection->contains<Foo>("f"));
+}
+
+void CollectionTests::names()
+{
+	const TestCollection *ccoll = collection;
+	list<string> nm = ccoll->get_names<Foo>();
+	EXPECT_EQUAL(nm.size(), 2);
+	set<string> nm_set(nm.begin(), nm.end());
+	EXPECT_EQUAL(nm_set.count("a"), 1);
+	EXPECT_EQUAL(nm_set.count("b"), 1);
+}
+
+void CollectionTests::names_future()
+{
+	list<string> nm = collection->get_names<Foo>();
+	EXPECT_EQUAL(nm.size(), 3);
+	set<string> nm_set(nm.begin(), nm.end());
+	EXPECT_EQUAL(nm_set.count("f"), 1);
+}
+
 void CollectionTests::fetch()
 {
 	const TestCollection *ccoll = collection;
@@ -102,6 +167,7 @@ void CollectionTests::fetch()
 	EXPECT_EQUAL(ccoll->get<Foo>("b").get_tag(), 2);
 	EXPECT_EQUAL(ccoll->get<Bar>("c").get_tag(), 3);
 	EXPECT_EQUAL(ccoll->get<Bar>("d").get_tag(), 4);
+	EXPECT_EQUAL(ccoll->get<Sub>("d").get_tag(), 4);
 }
 
 void CollectionTests::nonexistent()
@@ -116,9 +182,11 @@ void CollectionTests::type_mismatch()
 
 void CollectionTests::create()
 {
+	unsigned foo_count = Foo::get_create_count();
 	Foo &f = collection->get<Foo>("f");
 	Foo &f2 = collection->get<Foo>("f");
 	EXPECT_EQUAL(&f2, &f);
+	EXPECT(Foo::get_create_count()>foo_count);
 }
 
 void CollectionTests::name_collision()
@@ -128,21 +196,52 @@ void CollectionTests::name_collision()
 	a.release();
 }
 
+
 Base::Base():
 	tag(0)
 { }
 
+
 Base::Loader::Loader(Base &b):
 	DataFile::ObjectLoader<Base>(b)
 {
 	add("tag", &Base::tag);
 }
 
+
+unsigned Foo::create_count = 0;
+
+Foo::Foo()
+{
+	++create_count;
+}
+
+
+bool TestSource::is_loadable(const DataFile::CollectionItemTypeBase &, const string &name) const
+{
+	return name=="f";
+}
+
+DataFile::CollectionSource::NameList TestSource::get_names(const DataFile::CollectionItemTypeBase &) const
+{
+	NameList names;
+	names.push_back("f");
+	return names;
+}
+
+void TestSource::load(DataFile::Collection &coll, const DataFile::CollectionItemTypeBase &, const string &name) const
+{
+	if(name=="f")
+		coll.add("f", new Foo);
+}
+
+
 TestCollection::TestCollection()
 {
 	add_type<Foo>().keyword("foo").creator(&TestCollection::create_foo);
 	add_type<Bar>().keyword("bar");
-	add_type<Sub>().keyword("sub").store_as<Bar>();
+	add_type<Sub>().keyword("sub").base<Bar>();
+	add_source(source);
 }
 
 Foo *TestCollection::create_foo(const string &)