Mostly in test cases but there was one lingering reference to "future"
objects in the actual header as well.
- /** 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. */
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. */
void load();
void contains();
void contains_base();
void load();
void contains();
void contains_base();
- void contains_future();
+ void contains_loadable();
void names();
void names_base();
void names();
void names_base();
void fetch();
void nonexistent();
void type_mismatch();
void create();
void fetch();
void nonexistent();
void type_mismatch();
void create();
void name_collision();
};
void name_collision();
};
add(&CollectionTests::load, "Load objects");
add(&CollectionTests::contains, "Containment test");
add(&CollectionTests::contains_base, "Base class containment test");
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, "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::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;
add(&CollectionTests::name_collision, "Name collision").expect_throw<Msp::key_error>();
collection = new TestCollection;
EXPECT(ccoll->contains<Sub>("d"));
}
EXPECT(ccoll->contains<Sub>("d"));
}
-void CollectionTests::contains_future()
+void CollectionTests::contains_loadable()
{
const TestCollection *ccoll = collection;
EXPECT(!ccoll->contains<Foo>("f"));
{
const TestCollection *ccoll = collection;
EXPECT(!ccoll->contains<Foo>("f"));
EXPECT_EQUAL(nm_set.count("e"), 1);
}
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);
{
list<string> nm = collection->get_names<Foo>();
EXPECT_EQUAL(nm.size(), 3);
EXPECT(Foo::get_create_count()>foo_count);
}
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);
{
list<Foo *> nm = collection->get_list<Foo>();
EXPECT_EQUAL(nm.size(), 3);