X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiaab_common.h;h=d55063ca30fed20fb42376c3597b596b18f8a417;hb=093ec0e38eb672fea6e2572978fbd15aa0bfc40c;hp=2102240e79a78e3c7bcab4273dbc46a79e4be43f;hpb=f8fd44076329849a8ca9f1067c98c787fb80a7f0;p=xestiaab%2F.git

diff --git a/source/tests/xestiaab_common.h b/source/tests/xestiaab_common.h
index 2102240..d55063c 100644
--- a/source/tests/xestiaab_common.h
+++ b/source/tests/xestiaab_common.h
@@ -321,10 +321,67 @@ TEST(CommonFunctions, ConvertToHTML){
 	// Tests for converting data for inserting into a HTML
 	// formatted document.
 
+	wxString ConvertToHTMLData = "The test line where < is probably better than >!";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("The test line where &lt; is probably better than &gt;!", ConvertToHTMLData.ToStdString());
+
+	ConvertToHTMLData = "More testing &<>\n";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("More testing &amp;&lt;&gt;<br>", ConvertToHTMLData.ToStdString());
+
+	ConvertToHTMLData = "This is the first line.\nThis is the second line.\nThis is the third line.";
+	ConvertToHTML(&ConvertToHTMLData);
+	ASSERT_EQ("This is the first line.<br>This is the second line.<br>This is the third line.", ConvertToHTMLData.ToStdString());
+
 }
 
 TEST(CommonFunctions, MapDataExists){
 
 	// Tests for checking that map data exists.
 
+	std::map<int,int> MapExample;
+	int ItemIndex = 0;
+
+	MapExample.insert(std::make_pair(0,1));
+	MapExample.insert(std::make_pair(1,1));
+	MapExample.insert(std::make_pair(2,1));
+	MapExample.insert(std::make_pair(5,1));
+	MapExample.insert(std::make_pair(500,1));
+	MapExample.insert(std::make_pair(2415,1));
+
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 1;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 3;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 5;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 6;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 499;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 500;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 501;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2414;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2415;
+	ASSERT_EQ(true, MapDataExists(&ItemIndex, &MapExample));
+
+	ItemIndex = 2416;
+	ASSERT_EQ(false, MapDataExists(&ItemIndex, &MapExample));
+
 }
\ No newline at end of file