X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=tests%2Fmaputils.cpp;h=31c22320c801ff33f87ec500f24c92382a15d390;hp=78cdaad19fed04d39ecd22144f5687625101b4dc;hb=83394a2b0535da86930c2d9d07fb9f997d3f0e57;hpb=1e0abc3a49ade6a4fa1b38f744df070c40a87724

diff --git a/tests/maputils.cpp b/tests/maputils.cpp
index 78cdaad..31c2232 100644
--- a/tests/maputils.cpp
+++ b/tests/maputils.cpp
@@ -13,28 +13,56 @@ public:
 	static const char *get_name() { return "maputils"; }
 
 private:
-	void success();
-	void error();
+	void get_item();
+	void insert_unique();
+	void nonexistent_item();
+	void key_collision();
+	void uncastable_key();
 };
 
 
 MapUtilTests::MapUtilTests()
 {
-	add(&MapUtilTests::success, "success");
-	add(&MapUtilTests::error, "error").expect_throw<key_error>();
+	add(&MapUtilTests::get_item, "get_item");
+	add(&MapUtilTests::insert_unique, "insert_unique");
+	add(&MapUtilTests::nonexistent_item, "nonexistent item").expect_throw<key_error>();
+	add(&MapUtilTests::key_collision, "key collision").expect_throw<key_error>();
+	add(&MapUtilTests::uncastable_key, "uncastable key").expect_throw<key_error>();
 }
 
-void MapUtilTests::success()
+void MapUtilTests::get_item()
 {
 	map<int, string> m;
 	m[1] = "foo";
 	m[3] = "bar";
-	EXPECT_EQUAL(get_item(m, 1), "foo");
-	EXPECT_EQUAL(get_item(m, 3), "bar");
+	EXPECT_EQUAL(::get_item(m, 1), "foo");
+	EXPECT_EQUAL(::get_item(m, 3), "bar");
 }
 
-void MapUtilTests::error()
+void MapUtilTests::insert_unique()
 {
 	map<int, string> m;
-	get_item(m, 0);
+	::insert_unique(m, 1, "foo");
+	::insert_unique(m, 3, "bar");
+	EXPECT_EQUAL(m.count(1), 1);
+	EXPECT_EQUAL(m.count(3), 1);
+}
+
+void MapUtilTests::nonexistent_item()
+{
+	map<int, string> m;
+	::get_item(m, 0);
+}
+
+void MapUtilTests::key_collision()
+{
+	map<int, string> m;
+	::insert_unique(m, 1, "foo");
+	::insert_unique(m, 1, "bar");
+}
+
+void MapUtilTests::uncastable_key()
+{
+	map<pair<int, int>, string> m;
+	::get_item(m, make_pair(0, 0));
 }