Make Collections::objects protected, extend interface

Keeps all required features accessible, but through a controlled
interface.

2 files changed, 39 insertions, 39 deletions

diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 72f13b3..68ce6a6 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(brush47xml, *boost::unit_test::timeout(5))
 	BOOST_REQUIRE(brush47rvc->bogies.back());
 
 	auto railVehicle = std::make_shared<RailVehicle>(brush47rvc);
-	objects.objects.push_back(brush47rvc);
+	objects.emplace(brush47rvc);
 
 	render(10000);
 }
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
 	auto plant2 = std::make_shared<Plant>(tree_01_1_f, Location {{3000, -4000, 0}, {0, 1, 0}});
 	auto plant3 = std::make_shared<Plant>(tree_01_1_f, Location {{-2000, -4000, 0}, {0, 2, 0}});
 	auto plant4 = std::make_shared<Plant>(tree_01_1_f, Location {{3000, 2000, 0}, {0, 3, 0}});
-	objects.objects.push_back(tree_01_1_f);
+	objects.emplace(tree_01_1_f);
 
 	render(6000);
 }
@@ -160,13 +160,13 @@ BOOST_AUTO_TEST_CASE(lights, *boost::unit_test::timeout(5))
 	auto light2 = std::make_shared<Light>(rlight_f, Location {{-4000, 0, 0}, {0, 2, 0}});
 	auto light3 = std::make_shared<Light>(rlight_f, Location {{-4000, -4000, 0}, {0, 1, 0}});
 	auto light4 = std::make_shared<Light>(oldlamp_f, Location {{3000, 4600, 0}, {0, 2, 0}});
-	objects.objects.push_back(rlight_f);
-	objects.objects.push_back(oldlamp_f);
+	objects.emplace(rlight_f);
+	objects.emplace(oldlamp_f);
 
 	// yes I'm hacking some floor to light up as though its a bush
 	auto floorf = mf->assets.at("floor").dynamicCast<Foliage>();
 	auto floor = std::make_shared<Plant>(floorf, Location {});
-	objects.objects.push_back(floorf);
+	objects.emplace(floorf);
 
 	render(6000);
 }
diff --git a/test/test-network.cpp b/test/test-network.cpp
index 51fea8b..19a740e 100644
--- a/test/test-network.cpp
+++ b/test/test-network.cpp
@@ -139,83 +139,83 @@ BOOST_DATA_TEST_CASE(newNodeAt_new, INVALID_NODES, p)
 BOOST_AUTO_TEST_CASE(network_joins)
 {
 	// Ends
-	BOOST_CHECK(links.objects[2]->ends[1].nexts.empty());
+	BOOST_CHECK(links[2]->ends[1].nexts.empty());
 	// Join 0 <-> 1
-	BOOST_REQUIRE_EQUAL(links.objects[0]->ends[1].nexts.size(), 2);
-	BOOST_CHECK_EQUAL(links.objects[0]->ends[1].nexts[0].first.lock().get(), links.objects[1].get());
-	BOOST_CHECK_EQUAL(links.objects[0]->ends[1].nexts[0].second, 0);
-	BOOST_CHECK_EQUAL(links.objects[0]->ends[1].nexts[1].first.lock().get(), links.objects[5].get());
-	BOOST_CHECK_EQUAL(links.objects[0]->ends[1].nexts[1].second, 0);
-	BOOST_REQUIRE_EQUAL(links.objects[1]->ends[0].nexts.size(), 2);
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[0].nexts[0].first.lock().get(), links.objects[0].get());
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[0].nexts[0].second, 1);
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[0].nexts[1].first.lock().get(), links.objects[5].get());
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[0].nexts[1].second, 0);
+	BOOST_REQUIRE_EQUAL(links[0]->ends[1].nexts.size(), 2);
+	BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[0].first.lock().get(), links[1].get());
+	BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[0].second, 0);
+	BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[1].first.lock().get(), links[5].get());
+	BOOST_CHECK_EQUAL(links[0]->ends[1].nexts[1].second, 0);
+	BOOST_REQUIRE_EQUAL(links[1]->ends[0].nexts.size(), 2);
+	BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].first.lock().get(), links[0].get());
+	BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[0].second, 1);
+	BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].first.lock().get(), links[5].get());
+	BOOST_CHECK_EQUAL(links[1]->ends[0].nexts[1].second, 0);
 	// Join 1 <-> 2
-	BOOST_REQUIRE_EQUAL(links.objects[1]->ends[1].nexts.size(), 2);
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[1].nexts[0].first.lock().get(), links.objects[2].get());
-	BOOST_CHECK_EQUAL(links.objects[1]->ends[1].nexts[0].second, 0);
-	BOOST_REQUIRE_EQUAL(links.objects[2]->ends[0].nexts.size(), 2);
-	BOOST_CHECK_EQUAL(links.objects[2]->ends[0].nexts[0].first.lock().get(), links.objects[1].get());
-	BOOST_CHECK_EQUAL(links.objects[2]->ends[0].nexts[0].second, 1);
+	BOOST_REQUIRE_EQUAL(links[1]->ends[1].nexts.size(), 2);
+	BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].first.lock().get(), links[2].get());
+	BOOST_CHECK_EQUAL(links[1]->ends[1].nexts[0].second, 0);
+	BOOST_REQUIRE_EQUAL(links[2]->ends[0].nexts.size(), 2);
+	BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[0].first.lock().get(), links[1].get());
+	BOOST_CHECK_EQUAL(links[2]->ends[0].nexts[0].second, 1);
 }
 
 BOOST_DATA_TEST_CASE(routeTo_nodeNotInNetwork, INVALID_NODES, dest)
 {
-	const auto & start = links.objects.front()->ends[1];
+	const auto & start = links[0]->ends[1];
 	BOOST_CHECK_THROW((void)routeFromTo(start, dest), std::out_of_range);
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_noSteps)
 {
-	const auto & start = links.objects.front()->ends[1];
+	const auto & start = links[0]->ends[1];
 	auto r = this->routeFromTo(start, p100);
 	BOOST_CHECK(r.empty());
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_upStream_to2)
 {
-	const auto & start = links.objects.front()->ends[1];
+	const auto & start = links[0]->ends[1];
 	auto r = this->routeFromTo(start, p200);
 	BOOST_REQUIRE_EQUAL(r.size(), 1);
-	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links.objects[1].get());
+	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links[1].get());
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_upStream_to3)
 {
-	const auto & start = links.objects[0]->ends[1];
+	const auto & start = links[0]->ends[1];
 	auto r = this->routeFromTo(start, p300);
 	BOOST_REQUIRE_EQUAL(r.size(), 2);
-	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links.objects[1].get());
-	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links.objects[2].get());
+	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links[1].get());
+	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links[2].get());
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_downStream_to0)
 {
-	const auto & start = links.objects[2]->ends[0];
+	const auto & start = links[2]->ends[0];
 	auto r = this->routeFromTo(start, p000);
 	BOOST_REQUIRE_EQUAL(r.size(), 2);
-	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links.objects[1].get());
-	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links.objects[0].get());
+	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links[1].get());
+	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links[0].get());
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_upStream_3to300)
 {
-	const auto & start = links.objects[3]->ends[1];
+	const auto & start = links[3]->ends[1];
 	auto r = this->routeFromTo(start, p300);
 	BOOST_REQUIRE_EQUAL(r.size(), 2);
-	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links.objects[4].get());
-	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links.objects[2].get());
+	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links[4].get());
+	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links[2].get());
 }
 
 BOOST_AUTO_TEST_CASE(routeTo_downStream_3to300)
 {
-	const auto & start = links.objects[3]->ends[0];
+	const auto & start = links[3]->ends[0];
 	auto r = this->routeFromTo(start, p300);
 	BOOST_REQUIRE_EQUAL(r.size(), 3);
-	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links.objects[0].get());
-	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links.objects[1].get());
-	BOOST_CHECK_EQUAL(r[2].first.lock().get(), links.objects[2].get());
+	BOOST_CHECK_EQUAL(r[0].first.lock().get(), links[0].get());
+	BOOST_CHECK_EQUAL(r[1].first.lock().get(), links[1].get());
+	BOOST_CHECK_EQUAL(r[2].first.lock().get(), links[2].get());
 }
 
 BOOST_AUTO_TEST_SUITE_END()