Fixed Interpretation and Manifestation to deal with unknown Uris and Fixed all the test cases. Removed Test.cs file

Added a method in ZsUtils.cs which helps in creating a human readable variant of Manifestation and Interpretation Uri

5 files changed, 19 insertions, 21 deletions

diff --git a/Zeitgeist.Testsuite/Log/TestFindEventIds.cs b/Zeitgeist.Testsuite/Log/TestFindEventIds.cs
index 829d629..1ef2d18 100644
--- a/Zeitgeist.Testsuite/Log/TestFindEventIds.cs
+++ b/Zeitgeist.Testsuite/Log/TestFindEventIds.cs
@@ -13,16 +13,21 @@ namespace Zeitgeist.Testsuite
 		public void TestFindEventIdsPass()
 		{
 			TimeRange range = new TimeRange();
-			range.Begin = DateTime.Now.AddDays(-1);
+			range.Begin = DateTime.Now.AddDays(-30);
 			range.End = DateTime.Now;
 			
 			Event e = new Event();
-			e.Actor = "application://gedit.desktop";
+			e.Actor = "application:///usr/share/applications/eog.desktop";
 			Subject sub = new Subject();
 			e.Subjects.Add(sub);
 			
+			Event e2 = new Event();
+			e2.Actor = "application://eog.desktop";
+			Subject sub2 = new Subject();
+			e2.Subjects.Add(sub2);
+			
 			LogClient client = new LogClient();
-			List<uint> eventIds = client.FindEventIds(range, new List<Event>(){e}, StorageState.Any, 20, ResultType.MostRecentEvents);
+			List<uint> eventIds = client.FindEventIds(range, new List<Event>(){e,e2}, StorageState.Any, 20, ResultType.MostRecentEvents);
 			
 			CollectionAssert.IsNotEmpty(eventIds);
 		}
diff --git a/Zeitgeist.Testsuite/Log/TestFindEvents.cs b/Zeitgeist.Testsuite/Log/TestFindEvents.cs
index 21d8755..2e3eedc 100644
--- a/Zeitgeist.Testsuite/Log/TestFindEvents.cs
+++ b/Zeitgeist.Testsuite/Log/TestFindEvents.cs
@@ -13,16 +13,21 @@ namespace Zeitgeist.Testsuite
 		public void TestFindEventsPass()
 		{
 			TimeRange range = new TimeRange();
-			range.Begin = DateTime.Now.AddDays(-1);
+			range.Begin = DateTime.Now.AddDays(-30);
 			range.End = DateTime.Now;
 			
 			Event e = new Event();
-			e.Actor = "application://gedit.desktop";
+			e.Actor = "application:///usr/share/applications/eog.desktop";
 			Subject sub = new Subject();
 			e.Subjects.Add(sub);
 			
+			Event e2 = new Event();
+			e2.Actor = "application://eog.desktop";
+			Subject sub2 = new Subject();
+			e2.Subjects.Add(sub2);
+			
 			LogClient client = new LogClient();
-			List<Event> events = client.FindEvents(range, new List<Event>(){e}, StorageState.Any, 20, ResultType.MostRecentEvents);
+			List<Event> events = client.FindEvents(range, new List<Event>(){e,e2}, StorageState.Any, 20, ResultType.MostRecentEvents);
 			
 			CollectionAssert.IsNotEmpty(events);
 			
diff --git a/Zeitgeist.Testsuite/Log/TestGetEvents.cs b/Zeitgeist.Testsuite/Log/TestGetEvents.cs
index 8080acd..674a870 100644
--- a/Zeitgeist.Testsuite/Log/TestGetEvents.cs
+++ b/Zeitgeist.Testsuite/Log/TestGetEvents.cs
@@ -17,8 +17,11 @@ namespace Zeitgeist.Testsuite
 			List<uint> eventIdList = new List<uint>(){ 1, 2, 3 };
 			List<Event> events = client.GetEvents(eventIdList);
 			
+			Assert.IsNotNull(events);
+			
 			foreach(Event ev in events)
 			{
+				Assert.IsNotNull(ev);
 				Assert.IsNotNull(ev.Interpretation);
 				Assert.IsNotNull(ev.Manifestation);
 				Assert.IsNotEmpty(ev.Interpretation.Uri);
diff --git a/Zeitgeist.Testsuite/Test.cs b/Zeitgeist.Testsuite/Test.cs
deleted file mode 100644
index 7d6365c..0000000
--- a/Zeitgeist.Testsuite/Test.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using NUnit.Framework;
-namespace Zeitgeist.Testsuite
-{
-	[TestFixture()]
-	public class Test
-	{
-		[Test()]
-		public void TestCase ()
-		{
-		}
-	}
-}
-
diff --git a/Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj b/Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj
index 7e5b3bf..68ced91 100644
--- a/Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj
+++ b/Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj
@@ -38,7 +38,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Test.cs" />
     <Compile Include="Datamodel\TestInterpretation.cs" />
     <Compile Include="Datamodel\TestManifestation.cs" />
     <Compile Include="Log\TestGetEvents.cs" />