X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fcollection.cpp;h=6c9ef195bc2a0ea3166fc5ba07bb2c971425f97b;hb=HEAD;hp=38af5d0e58eef9364aaf5e8557f5045de625d746;hpb=62038f6100d131b760a2ac090933b7b998419bc9;p=libs%2Fdatafile.git

diff --git a/tests/collection.cpp b/tests/collection.cpp
index 38af5d0..6c9ef19 100644
--- a/tests/collection.cpp
+++ b/tests/collection.cpp
@@ -24,15 +24,15 @@ private:
 	void load();
 	void contains();
 	void contains_base();
-	void contains_future();
+	void contains_loadable();
 	void names();
 	void names_base();
-	void names_future();
+	void names_loadable();
 	void fetch();
 	void nonexistent();
 	void type_mismatch();
 	void create();
-	void list_future();
+	void list_loadable();
 	void name_collision();
 };
 
@@ -82,6 +82,7 @@ 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;
+	virtual IO::Seekable *open(const string &) const { return 0; }
 };
 
 
@@ -103,15 +104,15 @@ CollectionTests::CollectionTests()
 	add(&CollectionTests::load, "Load objects");
 	add(&CollectionTests::contains, "Containment test");
 	add(&CollectionTests::contains_base, "Base class containment test");
-	add(&CollectionTests::contains_future, "Future containment test");
+	add(&CollectionTests::contains_loadable, "Loadable containment test");
 	add(&CollectionTests::names, "List object names");
 	add(&CollectionTests::names_base, "List base class object names");
-	add(&CollectionTests::names_future, "List future object names");
+	add(&CollectionTests::names_loadable, "List loadable 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>();
 	add(&CollectionTests::create, "Create object");
-	add(&CollectionTests::list_future, "List future objects");
+	add(&CollectionTests::list_loadable, "List loadable objects");
 	add(&CollectionTests::name_collision, "Name collision").expect_throw<Msp::key_error>();
 
 	collection = new TestCollection;
@@ -152,7 +153,7 @@ void CollectionTests::contains_base()
 	EXPECT(ccoll->contains<Sub>("d"));
 }
 
-void CollectionTests::contains_future()
+void CollectionTests::contains_loadable()
 {
 	const TestCollection *ccoll = collection;
 	EXPECT(!ccoll->contains<Foo>("f"));
@@ -180,7 +181,7 @@ void CollectionTests::names_base()
 	EXPECT_EQUAL(nm_set.count("e"), 1);
 }
 
-void CollectionTests::names_future()
+void CollectionTests::names_loadable()
 {
 	list<string> nm = collection->get_names<Foo>();
 	EXPECT_EQUAL(nm.size(), 3);
@@ -217,7 +218,7 @@ void CollectionTests::create()
 	EXPECT(Foo::get_create_count()>foo_count);
 }
 
-void CollectionTests::list_future()
+void CollectionTests::list_loadable()
 {
 	list<Foo *> nm = collection->get_list<Foo>();
 	EXPECT_EQUAL(nm.size(), 3);