From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 3 Jun 2019 08:12:40 +0000 (+0300)
Subject: Update Collection terminology
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=sidebyside;h=ecaedcbad1193cefc7b54508e43233e94d6dbeed;hp=b6fea48ddccac20e2183163be41615fb89699330;p=libs%2Fdatafile.git

Update Collection terminology

Mostly in test cases but there was one lingering reference to "future"
objects in the actual header as well.
---

diff --git a/source/collection.h b/source/collection.h
index 34b1260..39e6f43 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -403,7 +403,7 @@ public:
 		return *this;
 	}
 
-	/** Adds a suffix that is used to match names when looking for future
+	/** Adds a suffix that is used to match names when looking for loadable
 	objects.  There is no implied separator; a name matches if it ends with the
 	suffix.  If a keyword is defined before any suffixes, then "."+keyword is
 	added as a suffix. */
diff --git a/tests/collection.cpp b/tests/collection.cpp
index 3833d1a..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();
 };
 
@@ -104,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;
@@ -153,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"));
@@ -181,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);
@@ -218,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);