Merge lp:~manishsinha/zeitgeist-sharp/testsuite into lp:~zeitgeist-sharp/zeitgeist-sharp/trunk

[Manish Sinha (मनीष सिन्हा)]

Added lots of Unit Tests

Added lots of Unit Tests

[Mirco Bauer (meebey)]

Cosmetic issues:
Empty Test.cs file

Serious issues:
in Zeitgeist/Datamodel/Event.cs
1057 - private string[] _metadata;
1058 - private string[][] _subjects;
1059 - private byte[] _payload;
1060 + public string[] _metadata;
1061 + public string[][] _subjects;
1062 + public byte[] _payload;
Those fields would not be exposed in this way! Re-check if you need to expose those fields, if so add properties for them. Are they only needed for test-cases? That needs special handling then (internal accessor).

in Zeitgeist/Datamodel/TimeRange.cs
1492 + public Int64 _begin;
1493 +
1494 + public Int64 _end;
Fields should never be public, as there are public properties I guess this is a typo.

Unsure:
in Zeitgeist/Datamodel/Subject.cs:
1385 + public Subject()
1386 + {
1387 + Uri = string.Empty;
1388 + Origin = string.Empty;
1389 + MimeType = string.Empty;
1390 + Text = string.Empty;
1391 + Storage = string.Empty;
1392 + Interpretation = new NameUri();
1393 + Manifestation = new NameUri();
1394 + }
Is the D-Bus API / Zeitgeist expecting empty strings in the case of "unset" / unspecified values? Because this is bad coding style to simply pre-init all fields for no good reason.

review: Needs Fixing (source)

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Cosmetic Issues:
Empty.cs file can be removed. Not a big deal

Serious Issues:
Well those fields have been made public since NDesk.DBus was throwing exceptions which sounded like "Backing field not found/accessible". I don't understand what the problem is. If this problem happens in one place, then it's fine, but it's happening with all the types which are being sent over DBus. i.e. RawEvent and TimeRange
Since the problem is occurring all over, then is it due to NDesk.DBus being at fault or some programming mistake.
If it is a progg mistake, then it is really tough to find since NDesk.DBus docs are nearly non-existant. Otherwise the way I was keeping it(private fields) are exactly how classes should be written.

If you can find out how it is to be done, can you please explain otherwise it is seriously a big headache. It doesnt work when fields are private

UnSure:
DBus doesnt support null. There is no datatype such as null over DBus. So every nullablle type can be to initialized before passing it over DBus. In this case strings are set to string.Empty
I know it is bad coding style, but possible to fix only if DBus starts taking null as a value.

[lp:~manishsinha/zeitgeist-sharp/testsuite]

41. By Manish Sinha (मनीष सिन्हा) on 2010-10-06

Merge with fixed build system and also changed the type from struct to class

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

I merged the trunk with this branch and resolved all the merge conflicts. This branch should merge with trunk without any conflicts.

I still want people to try out this branch with their zeitgeist-daemon running as 5 UnitTests are still failing on my laptop whereas all pass on my desktop. On my desktop I have two installations - 10.04 and 10.10RC with MonoDevelop 2.4 and Mono 2.6.7 (from badgerports) and on both installs they work well

On laptop I have 10.04 with same MD 2.4 and Mono 2.6.7(badgerports) and 5 unit tests fail.

If unit tests failing can be fixed, there is nothing preventing this from getting merged.

I have discussed with meebey and it looks public fields cannot be avoided. Probably some problems with ndesk-dbus. When zg-sharp is migrated to dbus-sharp, then we can fix this public field issue (Provided dbus-sharp doesnt have the same issue)

[lp:~manishsinha/zeitgeist-sharp/testsuite]

42. By Manish Sinha (मनीष सिन्हा) on 2010-10-07

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

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Chuck the previous message. I was running a very old version of Zeitgeist (some 0.3.x), removed it and installed from the trunk.

Now it works

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

I tried running all unit tests and it works. Plus, I removed the Test.cs file.

Don't find any show-stoppers here.

review: Approve (code unit test naming)

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

I rejected this merge since there is a superseded version of this which is in a different branch. Here is the merge request
https://code.launchpad.net/~manishsinha/zeitgeist-sharp/fixed-monitor/+merge/38948

review: Disapprove

Unmerged revisions

=== added directory 'Zeitgeist.Testsuite'
=== added directory 'Zeitgeist.Testsuite/Blacklist'
=== added directory 'Zeitgeist.Testsuite/Datamodel'
=== added file 'Zeitgeist.Testsuite/Datamodel/TestInterpretation.cs'
--- Zeitgeist.Testsuite/Datamodel/TestInterpretation.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Datamodel/TestInterpretation.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,449 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist.Datamodel;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestInterpretation
+	{
+		#region Interpretation
+		
+		[Test()]
+		public void TestAlarm()
+		{
+			Assert.AreEqual(Interpretation.Instance.Alarm.Name, "Alarm");
+			Assert.AreEqual(Interpretation.Instance.Alarm.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Alarm");
+		}
+		
+		[Test()]
+		public void TestBookmark()
+		{
+			Assert.AreEqual(Interpretation.Instance.Bookmark.Name, "Bookmark");
+			Assert.AreEqual(Interpretation.Instance.Bookmark.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Bookmark");
+		}
+		
+		[Test()]
+		public void TestBookmarkFolder()
+		{
+			Assert.AreEqual(Interpretation.Instance.BookmarkFolder.Name, "BookmarkFolder");
+			Assert.AreEqual(Interpretation.Instance.BookmarkFolder.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#BookmarkFolder");
+		}
+		
+		[Test()]
+		public void TestCalendar()
+		{
+			Assert.AreEqual(Interpretation.Instance.Calendar.Name, "Calendar");
+			Assert.AreEqual(Interpretation.Instance.Calendar.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Calendar");
+		}
+		
+		[Test()]
+		public void TestEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.Event.Name, "Event");
+			Assert.AreEqual(Interpretation.Instance.Event.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Event");
+		}
+		
+		[Test()]
+		public void TestExecutable()
+		{
+			Assert.AreEqual(Interpretation.Instance.Executable.Name, "Executable");
+			Assert.AreEqual(Interpretation.Instance.Executable.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Executable");
+		}
+		
+		[Test()]
+		public void TestFont()
+		{
+			Assert.AreEqual(Interpretation.Instance.Font.Name, "Font");
+			Assert.AreEqual(Interpretation.Instance.Font.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Font");
+		}
+		
+		[Test()]
+		public void TestFreebusy()
+		{
+			Assert.AreEqual(Interpretation.Instance.Freebusy.Name, "Freebusy");
+			Assert.AreEqual(Interpretation.Instance.Freebusy.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Freebusy");
+		}
+		
+		[Test()]
+		public void TestJournal()
+		{
+			Assert.AreEqual(Interpretation.Instance.Journal.Name, "Journal");
+			Assert.AreEqual(Interpretation.Instance.Journal.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Journal");
+		}
+		
+		[Test()]
+		public void TestMailbox()
+		{
+			Assert.AreEqual(Interpretation.Instance.Mailbox.Name, "Mailbox");
+			Assert.AreEqual(Interpretation.Instance.Mailbox.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Mailbox");
+		}
+		
+		[Test()]
+		public void TestMimeEntity()
+		{
+			Assert.AreEqual(Interpretation.Instance.MimeEntity.Name, "MimeEntity");
+			Assert.AreEqual(Interpretation.Instance.MimeEntity.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MimeEntity");
+		}
+		
+		[Test()]
+		public void TestTimezone()
+		{
+			Assert.AreEqual(Interpretation.Instance.Timezone.Name, "Timezone");
+			Assert.AreEqual(Interpretation.Instance.Timezone.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Timezone");
+		}
+		
+		[Test()]
+		public void TestTodo()
+		{
+			Assert.AreEqual(Interpretation.Instance.Todo.Name, "Todo");
+			Assert.AreEqual(Interpretation.Instance.Todo.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Todo");
+		}
+		
+		[Test()]
+		public void TestTVSeries()
+		{
+			Assert.AreEqual(Interpretation.Instance.TVSeries.Name, "TVSeries");
+			Assert.AreEqual(Interpretation.Instance.TVSeries.Uri, "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#TVSeries");
+		}
+		
+		[Test()]
+		public void TestWebsite()
+		{
+			Assert.AreEqual(Interpretation.Instance.Website.Name, "Website");
+			Assert.AreEqual(Interpretation.Instance.Website.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Website");
+		}
+		
+		#endregion
+		
+		#region DataContainer
+		
+		[Test()]
+		public void TestDataContainer()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.DataContainer.Name, "DataContainer");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.DataContainer.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#DataContainer");
+		}
+		
+		[Test()]
+		public void TestDataContainerArchive()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Archive.Name, "Archive");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Archive.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Archive");
+		}
+		
+		[Test()]
+		public void TestDataContainerFolder()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Folder.Name, "Folder");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Folder.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Folder");
+		}
+		
+		[Test()]
+		public void TestDataContainerTrash()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Trash.Name, "Trash");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Trash.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Trash");
+		}
+		
+		#endregion
+		
+		#region FileSystem
+		
+		[Test()]
+		public void TestDataContainerFilesystemImage()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Filesystem.FilesystemImage.Name, "FilesystemImage");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Filesystem.FilesystemImage.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FilesystemImage");
+		}
+		
+		[Test()]
+		public void TestDataContainerFilesystem()
+		{
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Filesystem.Filesystem.Name, "Filesystem");
+			Assert.AreEqual(Interpretation.Instance.DataContainer.Filesystem.Filesystem.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Filesystem");
+		}
+		
+		#endregion
+		
+		#region Document
+		
+		[Test()]
+		public void TestDocument()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.Document.Name, "Document");
+			Assert.AreEqual(Interpretation.Instance.Document.Document.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Document");
+		}
+		
+		[Test()]
+		public void TestDocumentMindMap()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.MindMap.Name, "MindMap");
+			Assert.AreEqual(Interpretation.Instance.Document.MindMap.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#MindMap");
+		}
+		
+		[Test()]
+		public void TestDocumentPresentation()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.Presentation.Name, "Presentation");
+			Assert.AreEqual(Interpretation.Instance.Document.Presentation.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Presentation");
+		}
+		
+		[Test()]
+		public void TestDocumentSpreadsheet()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.Spreadsheet.Name, "Spreadsheet");
+			Assert.AreEqual(Interpretation.Instance.Document.Spreadsheet.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Spreadsheet");
+		}
+		
+		[Test()]
+		public void TestDocumentTextDocument()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.TextDocument.Name, "TextDocument");
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.TextDocument.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#TextDocument");
+		}
+		
+		[Test()]
+		public void TestDocumentPaginatedTextDocument()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PaginatedTextDocument.Name, "PaginatedTextDocument");
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PaginatedTextDocument.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#PaginatedTextDocument");
+		}
+		
+		[Test()]
+		public void TestDocumentPlainTextDocument()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.PlainTextDocument.Name, "PlainTextDocument");
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.PlainTextDocument.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#PlainTextDocument");
+		}
+		
+		[Test()]
+		public void TestDocumentHtmlDocument()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.HtmlDocument.Name, "HtmlDocument");
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.HtmlDocument.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#HtmlDocument");
+		}
+		
+		[Test()]
+		public void TestDocumentSourceCode()
+		{
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.SourceCode.Name, "SourceCode");
+			Assert.AreEqual(Interpretation.Instance.Document.TextDocument.PlainTextDocument.SourceCode.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SourceCode");
+		}
+		
+		#endregion
+		
+		#region EventInterpretation
+		
+		[Test()]
+		public void TestEventInterpretation()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.EventInterpretation.Name, "EventInterpretation");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.EventInterpretation.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#EventInterpretation");
+		}
+		
+		[Test()]
+		public void TestAccessEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.AccessEvent.Name, "AccessEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.AccessEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AccessEvent");
+		}
+		
+		[Test()]
+		public void TestCreateEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.CreateEvent.Name, "CreateEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.CreateEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#CreateEvent");
+		}
+		
+		[Test()]
+		public void TestDeleteEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.DeleteEvent.Name, "DeleteEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.DeleteEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DeleteEvent");
+		}
+		
+		[Test()]
+		public void TestLeaveEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.LeaveEvent.Name, "LeaveEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.LeaveEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#LeaveEvent");
+		}
+		
+		[Test()]
+		public void TestModifyEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.ModifyEvent.Name, "ModifyEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.ModifyEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ModifyEvent");
+		}
+		
+		[Test()]
+		public void TestReceiveEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.ReceiveEvent.Name, "ReceiveEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.ReceiveEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ReceiveEvent");
+		}
+		
+		[Test()]
+		public void TestSendEvent()
+		{
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.SendEvent.Name, "SendEvent");
+			Assert.AreEqual(Interpretation.Instance.EventInterpretation.SendEvent.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#SendEvent");
+		}
+		
+		#endregion
+		
+		#region Media
+		
+		[Test()]
+		public void TestMedia()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Media.Name, "Media");
+			Assert.AreEqual(Interpretation.Instance.Media.Media.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Media");
+		}
+		
+		[Test()]
+		public void TestAudio()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Audio.Name, "Audio");
+			Assert.AreEqual(Interpretation.Instance.Media.Audio.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Audio");
+		}
+		
+		[Test()]
+		public void TestMusicPiece()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.MusicPiece.Name, "MusicPiece");
+			Assert.AreEqual(Interpretation.Instance.Media.MusicPiece.Uri, "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#MusicPiece");
+		}
+		
+		[Test()]
+		public void TestVisual()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Visual.Name, "Visual");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Visual.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Visual");
+		}
+		
+		[Test()]
+		public void TestImage()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.Image.Name, "Image");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.Image.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Image");
+		}
+		
+		[Test()]
+		public void TestIcon()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.Icon.Name, "Icon");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.Icon.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Icon");
+		}
+		
+		[Test()]
+		public void TestVectorImage()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.VectorImage.Name, "VectorImage");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.VectorImage.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#VectorImage");
+		}
+		
+		[Test()]
+		public void TestRasterImage()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.RasterImage.RasterImage.Name, "RasterImage");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.RasterImage.RasterImage.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RasterImage");
+		}
+		
+		[Test()]
+		public void TestCursor()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.RasterImage.Cursor.Name, "Cursor");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Image.RasterImage.Cursor.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Cursor");
+		}
+		
+		[Test()]
+		public void TestVideo()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.Video.Name, "Video");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.Video.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Video");
+		}
+		
+		[Test()]
+		public void TestMovie()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.Movie.Name, "Movie");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.Movie.Uri, "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#Movie");
+		}
+		
+		[Test()]
+		public void TestTVShow()
+		{
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.TVShow.Name, "TVShow");
+			Assert.AreEqual(Interpretation.Instance.Media.Visual.Video.TVShow.Uri, "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#TVShow");
+		}
+		
+		[Test()]
+		public void TestMediaList()
+		{
+			Assert.AreEqual(Interpretation.Instance.MediaList.MediaList.Name, "MediaList");
+			Assert.AreEqual(Interpretation.Instance.MediaList.MediaList.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#MediaList");
+		}
+		
+		[Test()]
+		public void TestMusicAlbum()
+		{
+			Assert.AreEqual(Interpretation.Instance.MediaList.MusicAlbum.Name, "MusicAlbum");
+			Assert.AreEqual(Interpretation.Instance.MediaList.MusicAlbum.Uri, "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#MusicAlbum");
+		}
+		
+		#endregion
+		
+		#region MessageType
+		
+		[Test()]
+		public void TestMessage()
+		{
+			Assert.AreEqual(Interpretation.Instance.Message.Message.Name, "Message");
+			Assert.AreEqual(Interpretation.Instance.Message.Message.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Message");
+		}
+		
+		[Test()]
+		public void TestEmail()
+		{
+			Assert.AreEqual(Interpretation.Instance.Message.Email.Name, "Email");
+			Assert.AreEqual(Interpretation.Instance.Message.Email.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#Email");
+		}
+		
+		[Test()]
+		public void TestIMMessage()
+		{
+			Assert.AreEqual(Interpretation.Instance.Message.IMMessage.Name, "IMMessage");
+			Assert.AreEqual(Interpretation.Instance.Message.IMMessage.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#IMMessage");
+		}
+		
+		#endregion
+		
+		#region SoftwareType
+		
+		[Test()]
+		public void TestSoftware()
+		{
+			Assert.AreEqual(Interpretation.Instance.Software.Software.Name, "Software");
+			Assert.AreEqual(Interpretation.Instance.Software.Software.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Software");
+		}
+		
+		[Test()]
+		public void TestApplication()
+		{
+			Assert.AreEqual(Interpretation.Instance.Software.Application.Name, "Application");
+			Assert.AreEqual(Interpretation.Instance.Software.Application.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Application");
+		}
+		
+		[Test()]
+		public void TestOperatingSystem()
+		{
+			Assert.AreEqual(Interpretation.Instance.Software.OperatingSystem.Name, "OperatingSystem");
+			Assert.AreEqual(Interpretation.Instance.Software.OperatingSystem.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#OperatingSystem");
+		}
+		
+		#endregion
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Datamodel/TestManifestation.cs'
--- Zeitgeist.Testsuite/Datamodel/TestManifestation.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Datamodel/TestManifestation.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,156 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist.Datamodel;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestManifestation
+	{
+		#region Manifestation
+		
+		[Test()]
+		public void TestCalendarDataObject()
+		{
+			Assert.AreEqual(Manifestation.Instance.CalendarDataObject.Name, "CalendarDataObject");
+			Assert.AreEqual(Manifestation.Instance.CalendarDataObject.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#CalendarDataObject");
+		}
+		
+		[Test()]
+		public void TestHardDiskPartition()
+		{
+			Assert.AreEqual(Manifestation.Instance.HardDiskPartition.Name, "HardDiskPartition");
+			Assert.AreEqual(Manifestation.Instance.HardDiskPartition.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#HardDiskPartition");
+		}
+		
+		[Test()]
+		public void TestMailboxDataObject()
+		{
+			Assert.AreEqual(Manifestation.Instance.MailboxDataObject.Name, "MailboxDataObject");
+			Assert.AreEqual(Manifestation.Instance.MailboxDataObject.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MailboxDataObject");
+		}
+		
+		[Test()]
+		public void TestMediaStream()
+		{
+			Assert.AreEqual(Manifestation.Instance.MediaStream.Name, "MediaStream");
+			Assert.AreEqual(Manifestation.Instance.MediaStream.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#MediaStream");
+		}
+		
+		[Test()]
+		public void TestRemotePortAddress()
+		{
+			Assert.AreEqual(Manifestation.Instance.RemotePortAddress.Name, "RemotePortAddress");
+			Assert.AreEqual(Manifestation.Instance.RemotePortAddress.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RemotePortAddress");
+		}
+		
+		[Test()]
+		public void TestSoftwareItem()
+		{
+			Assert.AreEqual(Manifestation.Instance.SoftwareItem.Name, "SoftwareItem");
+			Assert.AreEqual(Manifestation.Instance.SoftwareItem.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SoftwareItem");
+		}
+		
+		[Test()]
+		public void TestSoftwareService()
+		{
+			Assert.AreEqual(Manifestation.Instance.SoftwareService.Name, "SoftwareService");
+			Assert.AreEqual(Manifestation.Instance.SoftwareService.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SoftwareService");
+		}
+		
+		#endregion
+		
+		#region EventManifestation
+		
+		[Test()]
+		public void TestEventManifestation()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.EventManifestation.Name, "EventManifestation");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.EventManifestation.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#EventManifestation");
+		}
+		
+		[Test()]
+		public void TestHeuristicActivity()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.HeuristicActivity.Name, "HeuristicActivity");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.HeuristicActivity.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#HeuristicActivity");
+		}
+		
+		[Test()]
+		public void TestScheduledActivity()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.ScheduledActivity.Name, "ScheduledActivity");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.ScheduledActivity.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ScheduledActivity");
+		}
+		
+		[Test()]
+		public void TestSystemNotification()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.SystemNotification.Name, "SystemNotification");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.SystemNotification.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#SystemNotification");
+		}
+		
+		[Test()]
+		public void TestUserActivity()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.UserActivity.Name, "UserActivity");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.UserActivity.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#UserActivity");
+		}
+		
+		[Test()]
+		public void TestWorldActivity()
+		{
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.WorldActivity.Name, "WorldActivity");
+			Assert.AreEqual(Manifestation.Instance.EventManifestation.WorldActivity.Uri, "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#WorldActivity");
+		}
+		
+		#endregion
+		
+		#region FileDataObject
+		
+		[Test()]
+		public void TestFileDataObject()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.FileDataObject.Name, "FileDataObject");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.FileDataObject.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject");
+		}
+		
+		[Test()]
+		public void TestDeletedResource()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.DeletedResource.Name, "DeletedResource");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.DeletedResource.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#DeletedResource");
+		}
+		
+		[Test()]
+		public void TestRemoteDataObject()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.RemoteDataObject.Name, "RemoteDataObject");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.RemoteDataObject.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RemoteDataObject");
+		}
+		
+		[Test()]
+		public void TestEmbeddedFileDataObject()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.EmbeddedFileDataObject.Name, "EmbeddedFileDataObject");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.EmbeddedFileDataObject.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#EmbeddedFileDataObject");
+		}
+		
+		[Test()]
+		public void TestArchiveItem()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.ArchiveItem.Name, "ArchiveItem");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.ArchiveItem.Uri, "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#ArchiveItem");
+		}
+		
+		[Test()]
+		public void TestAttachment()
+		{
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.Attachment.Name, "Attachment");
+			Assert.AreEqual(Manifestation.Instance.FileDataObject.EmbeddedFileDataObject.Attachment.Uri, "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Attachment");
+		}
+		
+		#endregion
+	}
+}
+

=== added directory 'Zeitgeist.Testsuite/Datasource'
=== added directory 'Zeitgeist.Testsuite/Log'
=== added file 'Zeitgeist.Testsuite/Log/TestDeleteEvents.cs'
--- Zeitgeist.Testsuite/Log/TestDeleteEvents.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Log/TestDeleteEvents.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,50 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestDeleteEvents
+	{
+		[Test()]
+		public void TestDeleteEventsPass()
+		{
+			Event ev1 = new Event();
+			Subject sub11 = new Subject();
+			Subject sub12 = new Subject();
+			ev1.Subjects.Add(sub11);
+			ev1.Subjects.Add(sub12);
+			
+			Event ev2 = new Event();
+			Subject sub21 = new Subject();
+			Subject sub22 = new Subject();
+			ev2.Subjects.Add(sub21);
+			ev2.Subjects.Add(sub22);
+			
+			LogClient client = new LogClient();
+			List<uint> eventIds = client.InsertEvents(new List<Event>() { ev1, ev2 });
+			
+			CollectionAssert.IsNotEmpty(eventIds);
+			Assert.AreEqual(eventIds.Count, 2);
+			
+			TimeRange range = client.DeleteEvents(eventIds);
+			
+			Assert.IsNotNull(range.Begin);
+			Assert.IsNotNull(range.End);
+		}
+		
+		[Test()]
+		public void TestDeleteEventsFail()
+		{
+			LogClient client = new LogClient();
+			
+			TimeRange range = client.DeleteEvents(new List<uint>(){ 3000 });
+			
+			Assert.IsNull(range);
+		}
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Log/TestFindEventIds.cs'
--- Zeitgeist.Testsuite/Log/TestFindEventIds.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Log/TestFindEventIds.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,36 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestFindEventIds
+	{
+		[Test()]
+		public void TestFindEventIdsPass()
+		{
+			TimeRange range = new TimeRange();
+			range.Begin = DateTime.Now.AddDays(-30);
+			range.End = DateTime.Now;
+			
+			Event e = new Event();
+			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,e2}, StorageState.Any, 20, ResultType.MostRecentEvents);
+			
+			CollectionAssert.IsNotEmpty(eventIds);
+		}
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Log/TestFindEvents.cs'
--- Zeitgeist.Testsuite/Log/TestFindEvents.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Log/TestFindEvents.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,43 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestFindEvents
+	{
+		[Test()]
+		public void TestFindEventsPass()
+		{
+			TimeRange range = new TimeRange();
+			range.Begin = DateTime.Now.AddDays(-30);
+			range.End = DateTime.Now;
+			
+			Event e = new Event();
+			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,e2}, StorageState.Any, 20, ResultType.MostRecentEvents);
+			
+			CollectionAssert.IsNotEmpty(events);
+			
+			foreach(Event ev in events)
+			{
+				Assert.Greater(ev.Id, 0);
+				Assert.IsNotEmpty(ev.Actor);
+				Assert.IsNotNull(ev.Interpretation);
+			}
+		}
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Log/TestGetEvents.cs'
--- Zeitgeist.Testsuite/Log/TestGetEvents.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Log/TestGetEvents.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,54 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestGetEvents
+	{
+		[Test()]
+		public void TestEventIds()
+		{
+			LogClient client = new LogClient();
+			
+			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);
+				Assert.IsNotEmpty(ev.Manifestation.Uri);
+				
+				Assert.IsNotNull(ev.Timestamp);
+				
+				Assert.IsNotNull(ev.Actor);
+				
+				CollectionAssert.AllItemsAreNotNull(ev.Subjects);
+				CollectionAssert.AllItemsAreUnique(ev.Subjects);
+			}
+		}
+		
+		[Test()]
+		public void TestNonExistingEventIds()
+		{
+			LogClient client = new LogClient();
+			
+			List<uint> eventIdList = new List<uint>(){ 100000, 200000, 300000 };
+			List<Event> events = client.GetEvents(eventIdList);
+			
+			foreach(Event ev in events)
+			{
+				Assert.IsNull(ev);
+			}
+		}
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Log/TestInsertEvents.cs'
--- Zeitgeist.Testsuite/Log/TestInsertEvents.cs	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Log/TestInsertEvents.cs	2010-10-07 15:32:44 +0000
@@ -0,0 +1,38 @@
+using System;
+using NUnit.Framework;
+using Zeitgeist;
+using Zeitgeist.Datamodel;
+using System.Collections.Generic;
+
+namespace Zeitgeist.Testsuite
+{
+	[TestFixture()]
+	public class TestInsertEvents
+	{
+		[Test()]
+		public void TestInsertEventsPass()
+		{
+			Event ev = new Event();
+			ev.Interpretation = Interpretation.Instance.EventInterpretation.AccessEvent;
+			ev.Manifestation = Manifestation.Instance.EventManifestation.UserActivity;
+			ev.Actor = "application://tomboy.desktop";
+			
+			Subject sub11 = new Subject();
+			sub11.Uri = "/home/manish/.local/share/tomboy/bf7112c1-28dd-4079-b566-c135b19c4e01.note";
+			sub11.Interpretation = Interpretation.Instance.EventInterpretation.AccessEvent;
+			sub11.Manifestation = Manifestation.Instance.EventManifestation.UserActivity;
+			sub11.Origin = "file:///home/manish/.local/share/tomboy/";
+			sub11.MimeType = "text/x-note";
+			sub11.Text = "Ubuntu One";
+			
+			ev.Subjects.Add(sub11);
+			
+			LogClient client = new LogClient();
+			List<uint> eventIds = client.InsertEvents(new List<Event>() { ev });
+			
+			Assert.IsNotNull(eventIds);
+			CollectionAssert.IsNotEmpty(eventIds);
+		}
+	}
+}
+

=== added file 'Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj'
--- Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj	1970-01-01 00:00:00 +0000
+++ Zeitgeist.Testsuite/Zeitgeist.Testsuite.csproj	2010-10-07 15:32:44 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{319E54B4-6715-4287-8E3C-88B7CDDA167A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Zeitgeist.Testsuite</RootNamespace>
+    <AssemblyName>Zeitgeist.Testsuite</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <Package>mono-nunit</Package>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <Package>mono-nunit</Package>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Datamodel\TestInterpretation.cs" />
+    <Compile Include="Datamodel\TestManifestation.cs" />
+    <Compile Include="Log\TestGetEvents.cs" />
+    <Compile Include="Log\TestInsertEvents.cs" />
+    <Compile Include="Log\TestDeleteEvents.cs" />
+    <Compile Include="Log\TestFindEventIds.cs" />
+    <Compile Include="Log\TestFindEvents.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Zeitgeist\Zeitgeist.csproj">
+      <Project>{A8352F1A-F10C-41E6-B6B0-655703358EF4}</Project>
+      <Name>Zeitgeist</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Log\" />
+    <Folder Include="Blacklist\" />
+    <Folder Include="Datasource\" />
+    <Folder Include="Datamodel\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

=== modified file 'Zeitgeist.sln'
--- Zeitgeist.sln	2010-09-19 19:43:25 +0000
+++ Zeitgeist.sln	2010-10-07 15:32:44 +0000
@@ -3,12 +3,18 @@
 # Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zeitgeist", "Zeitgeist\Zeitgeist.csproj", "{A8352F1A-F10C-41E6-B6B0-655703358EF4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zeitgeist.Testsuite", "Zeitgeist.Testsuite\Zeitgeist.Testsuite.csproj", "{319E54B4-6715-4287-8E3C-88B7CDDA167A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{319E54B4-6715-4287-8E3C-88B7CDDA167A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{319E54B4-6715-4287-8E3C-88B7CDDA167A}.Debug|x86.Build.0 = Debug|Any CPU
+		{319E54B4-6715-4287-8E3C-88B7CDDA167A}.Release|x86.ActiveCfg = Release|Any CPU
+		{319E54B4-6715-4287-8E3C-88B7CDDA167A}.Release|x86.Build.0 = Release|Any CPU
 		{A8352F1A-F10C-41E6-B6B0-655703358EF4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A8352F1A-F10C-41E6-B6B0-655703358EF4}.Debug|x86.Build.0 = Debug|Any CPU
 		{A8352F1A-F10C-41E6-B6B0-655703358EF4}.Release|x86.ActiveCfg = Release|Any CPU

=== modified file 'Zeitgeist/Client/ILog.cs'
--- Zeitgeist/Client/ILog.cs	2010-10-01 16:29:35 +0000
+++ Zeitgeist/Client/ILog.cs	2010-10-07 15:32:44 +0000
@@ -59,7 +59,7 @@
 		/// An array containing the IDs of all matching events, up to a maximum of num_events events. 
 		/// Sorted and grouped as defined by the result_type parameter. <see cref="T:System.UInt32[]"/>
 		/// </returns>
-		UInt32[] FindEventIds(TimeRange range, RawEvent[] eventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
+		UInt32[] FindEventIds(RawTimeRange range, RawEvent[] eventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
 		
 		/// <summary>
 		/// Get events matching a given set of templates.
@@ -87,7 +87,7 @@
 		/// <returns>
 		/// Full event data for all the requested IDs, up to a maximum of num_events events, sorted and grouped as defined by the result_type parameter. <see cref="T:Zeitgeist.Datamodel.RawEvent[]"/>
 		/// </returns>
-		RawEvent[] FindEvents(TimeRange range, RawEvent[] eventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
+		RawEvent[] FindEvents(RawTimeRange range, RawEvent[] eventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
 		
 		/// <summary>
 		/// Warning: This API is EXPERIMENTAL and is not fully supported yet.
@@ -115,7 +115,7 @@
 		/// <returns>
 		/// A list of URIs matching the described criteria <see cref="T:System.String[]"/>
 		/// </returns>
-		string[] FindRelatedUris(TimeRange range, RawEvent[] eventTemplates, RawEvent[] resultEventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
+		string[] FindRelatedUris(RawTimeRange range, RawEvent[] eventTemplates, RawEvent[] resultEventTemplates, UInt32 state, UInt32 maxEvents, UInt32 resType);
 		
 		/// <summary>
 		/// Inserts events into the log. Returns an array containing the IDs of the inserted events
@@ -144,7 +144,7 @@
 		/// <param name="eventTemplates">
 		/// RawEvent templates that events must match in order to trigger the monitor <see cref="T:Zeitgeist.Datamodel.RawEvent[]"/>
 		/// </param>
-		void InstallMonitor(ObjectPath monitorPath, TimeRange range, RawEvent[] eventTemplates);
+		void InstallMonitor(ObjectPath monitorPath, RawTimeRange range, RawEvent[] eventTemplates);
 		
 		/// <summary>
 		/// Remove a monitor installed with InstallMonitor()
@@ -161,9 +161,9 @@
 		/// The eventId of the Events to be deleted <see cref="T:System.UInt32[]"/>
 		/// </param>
 		/// <returns>
-		/// The TimeRange <see cref="T:Zeitgeist.Datamodel.TimeRange"/>
+		/// The TimeRange <see cref="T:Zeitgeist.Datamodel.RawTimeRange"/>
 		/// </returns>
-		TimeRange DeleteEvents(UInt32[] eventIds);
+		RawTimeRange DeleteEvents(UInt32[] eventIds);
 		
 		/// <summary>
 		/// Delete the log file and all its content

=== modified file 'Zeitgeist/Datamodel/Event.cs'
--- Zeitgeist/Datamodel/Event.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/Datamodel/Event.cs	2010-10-07 15:32:44 +0000
@@ -21,6 +21,10 @@
 		{
 			Subjects = new List<Subject>();
 			Payload =new byte[]{};
+			Actor = string.Empty;
+			Timestamp = ZsUtils.Epoch;
+			Interpretation = new NameUri();
+			Manifestation = new NameUri();
 		}
 		
 		/// <summary>
@@ -97,7 +101,7 @@
 	/// <summary>
 	/// The Raw form of Event. Get Event.FromRaw to create an Event from a RawEvent
 	/// </summary>
-	internal struct RawEvent 
+	internal class RawEvent 
 	{
 		/// <summary>
 		/// The event Metadata
@@ -143,6 +147,11 @@
 				_payload = value;
 			}
 		}
+		/// <summary>
+		/// The default constructor of RawEvent
+		/// </summary>
+		public RawEvent()
+		{}
 		
 		/// <summary>
 		/// A parameterized constructor for creating a RawEvent
@@ -186,13 +195,9 @@
 			for(int i=0; i< metaDataList.Capacity; i++)
 				metaDataList.Add(null);
 			
-			if(ev.Id == 0)
-				metaDataList[(int)EventMetadataPosition.Id] = string.Empty;
-			else
-				metaDataList[(int)EventMetadataPosition.Id] = ev.Id.ToString();
-			
-			
-			metaDataList[(int)EventMetadataPosition.Timestamp] = ZsUtils.ToTimestamp(ev.Timestamp).ToString();
+			metaDataList[(int)EventMetadataPosition.Id] = (ev.Id == 0)? string.Empty: ev.Id.ToString();
+			metaDataList[(int)EventMetadataPosition.Timestamp] = (ev.Id == 0)? string.Empty: ZsUtils.ToTimestamp(ev.Timestamp).ToString();
+			
 			metaDataList[(int)EventMetadataPosition.Actor] = ev.Actor;
 			metaDataList[(int)EventMetadataPosition.Interpretation] = ev.Interpretation.Uri;
 			metaDataList[(int)EventMetadataPosition.Manifestation] = ev.Manifestation.Uri;
@@ -311,9 +316,9 @@
 		
 		#region RawEvent Private Fields
 		
-		private string[] _metadata;
-		private string[][] _subjects;
-		private byte[] _payload;
+		public string[] _metadata;
+		public string[][] _subjects;
+		public byte[] _payload;
 		
 		#endregion
 	}

=== modified file 'Zeitgeist/Datamodel/Interpretation.cs'
--- Zeitgeist/Datamodel/Interpretation.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/Datamodel/Interpretation.cs	2010-10-07 15:32:44 +0000
@@ -393,34 +393,34 @@
 			   return _website;
 			   
 			NameUri datacont = _data_container.Search(interpretation);
-			if(datacont.Name != null)
+			if(datacont != null)
 				return datacont;
 			
 			NameUri doc = _document.Search(interpretation);
-			if(doc.Name != null)
+			if(doc != null)
 				return doc;
 			
 			NameUri evnt_int = _event_interpretation.Search(interpretation);
-			if(evnt_int.Name != null)
+			if(evnt_int != null)
 				return evnt_int;
 			
 			NameUri media = _media.Search(interpretation);
-			if(media.Name != null)
+			if(media != null)
 				return media;
 			
 			NameUri media_lst = _media_list.Search(interpretation);
-			if(media_lst.Name != null)
+			if(media_lst != null)
 				return media_lst;
 			
 			NameUri msg = _message.Search(interpretation);
-			if(msg.Name != null)
+			if(msg != null)
 				return msg;
 			
 			NameUri sw = _software.Search(interpretation);
-			if(sw.Name != null)
+			if(sw != null)
 				return sw;
 			   
-			return new NameUri();
+			return new NameUri(ZsUtils.GetStringAnchor(interpretation), interpretation);
 		}
 		
 		#region Private Fields
@@ -563,10 +563,10 @@
 			   return _trash;
 			
 			NameUri fs = _filesystem.Search(interpretation);
-			if(fs.Name != null)
+			if(fs != null)
 				return fs;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -622,7 +622,7 @@
 			if(string.Equals(_file_system.Uri, interpretation))
 			   return _file_system;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -725,10 +725,10 @@
 			   return _spreadsheet;
 			
 			NameUri textdoc = _text_document.Search(interpretation);
-			if(textdoc.Name != null)
+			if(textdoc != null)
 				return textdoc;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -749,6 +749,20 @@
 	public class TextDocumentType
 	{
 		/// <summary>
+		/// A text document. (Display name: 'TextDocument')
+		/// </summary>
+		/// <remarks>
+		/// http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#TextDocument
+		/// </remarks>
+		public NameUri TextDocument
+		{
+			get
+			{
+				return _text_document;
+			}
+		}
+		
+		/// <summary>
 		/// A file containing a text document, that is unambiguously divided into pages. Examples might include PDF, DOC, PS, DVI etc. (Display name: 'PaginatedTextDocument')
 		/// </summary>
 		/// <remarks>
@@ -783,15 +797,17 @@
 			   return _paginated_text_document;
 			
 			NameUri plaintext = _plain_text_document.Search(interpretation);
-			if(plaintext.Name != null)
+			if(plaintext != null)
 				return plaintext;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
 		
-		private NameUri _paginated_text_document = new NameUri("Spreadsheet", "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Spreadsheet");
+		private NameUri _text_document = new NameUri("TextDocument", "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#TextDocument");
+		
+		private NameUri _paginated_text_document = new NameUri("PaginatedTextDocument", "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#PaginatedTextDocument");
 		
 		private PlainTextDocumentType _plain_text_document = new PlainTextDocumentType();
 		
@@ -853,7 +869,7 @@
 			if(string.Equals(_source_code.Uri, interpretation))
 			   return _source_code;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1012,7 +1028,7 @@
 			   return _send_event;
 			
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1110,10 +1126,10 @@
 			   return _music_piece;
 			
 			NameUri visual = _visual_type.Search(interpretation);
-			if(visual.Name != null)
+			if(visual != null)
 				return visual;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1179,14 +1195,14 @@
 			   return _visual;
 			
 			NameUri image = _image.Search(interpretation);
-			if(image.Name != null)
+			if(image != null)
 				return image;
 			
 			NameUri video = _video.Search(interpretation);
-			if(video.Name != null)
+			if(video != null)
 				return video;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1267,13 +1283,13 @@
 			   return _icon;
 			
 			NameUri rast = _raster_image.Search(interpretation);
-			if(rast.Name != null)
+			if(rast != null)
 				return rast;
 			
 			if(string.Equals(_vector_image.Uri, interpretation))
 			   return _vector_image;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1328,7 +1344,7 @@
 			if(string.Equals(_cursor.Uri, interpretation))
 			   return _cursor;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1395,7 +1411,7 @@
 			if(string.Equals(_tv_show.Uri, interpretation))
 			   return _tv_show;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -1451,7 +1467,7 @@
 			if(string.Equals(_music_album.Uri, interpretation))
 			   return _music_album;
 			
-			return new NameUri();
+			return null;
 		}
 				
 		#region Private Fields
@@ -1522,7 +1538,7 @@
 			if(string.Equals(_im_message.Uri, interpretation))
 			   return _im_message;
 			
-			return new NameUri();
+			return null;
 		}
 				
 		#region Private Fields
@@ -1595,7 +1611,7 @@
 			if(string.Equals(_os.Uri, interpretation))
 			   return _os;
 			
-			return new NameUri();
+			return null;
 		}
 				
 		#region Private Fields

=== modified file 'Zeitgeist/Datamodel/Manifestation.cs'
--- Zeitgeist/Datamodel/Manifestation.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/Datamodel/Manifestation.cs	2010-10-07 15:32:44 +0000
@@ -157,11 +157,11 @@
 			   return _cal_data_obj;
 			
 			NameUri event_manifestation = _event_manifestation.Search(manifestation);
-			if(event_manifestation.Name != null)
+			if(event_manifestation != null)
 				return event_manifestation;
 			
 			NameUri file_data_obj = _file_data_obj.Search(manifestation);
-			if(file_data_obj.Name != null)
+			if(file_data_obj != null)
 				return file_data_obj;
 			
 			if(string.Equals(_hd_partition.Uri, manifestation))
@@ -182,7 +182,7 @@
 			if(string.Equals(_sw_service.Uri, manifestation))
 			   return _sw_service;
 			
-			return new NameUri();
+			return new NameUri(ZsUtils.GetStringAnchor(manifestation), manifestation);
 		}
 		
 		#region Private Fields
@@ -316,7 +316,7 @@
 			if(string.Equals(_world_activity.Uri, manifestation))
 			   return _world_activity;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -403,13 +403,13 @@
 			   return _deleted_resc;
 			
 			NameUri embedded_file_data_obj = _embedded_file_data_obj.Search(manifestation);
-			if(embedded_file_data_obj.Name != null)
+			if(embedded_file_data_obj != null)
 				return embedded_file_data_obj;
 			
 			if(string.Equals(_remote_data_obj.Uri, manifestation))
 			   return _remote_data_obj;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields
@@ -480,7 +480,7 @@
 			if(string.Equals(_attachment.Uri, manifestation))
 			   return _attachment;
 			
-			return new NameUri();
+			return null;
 		}
 		
 		#region Private Fields

=== modified file 'Zeitgeist/Datamodel/NameUri.cs'
--- Zeitgeist/Datamodel/NameUri.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/Datamodel/NameUri.cs	2010-10-07 15:32:44 +0000
@@ -12,6 +12,8 @@
 	{
 		public NameUri()
 		{
+			Name = string.Empty;
+			Uri = string.Empty;
 		}
 			
 		public NameUri(string name, string uri)

=== modified file 'Zeitgeist/Datamodel/Subject.cs'
--- Zeitgeist/Datamodel/Subject.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/Datamodel/Subject.cs	2010-10-07 15:32:44 +0000
@@ -6,8 +6,19 @@
 	/// <summary>
 	/// Represents a subject of an Event
 	/// </summary>
-	public struct Subject
+	public class Subject
 	{
+		public Subject()
+		{
+			Uri = string.Empty;
+			Origin = string.Empty;
+			MimeType = string.Empty;
+			Text = string.Empty;
+			Storage = string.Empty;
+			Interpretation = new NameUri();
+			Manifestation = new NameUri();
+		}
+		
 		/// <summary>
 		/// URI of the subject
 		/// </summary>

=== modified file 'Zeitgeist/Datamodel/TimeRange.cs'
--- Zeitgeist/Datamodel/TimeRange.cs	2010-10-01 18:15:46 +0000
+++ Zeitgeist/Datamodel/TimeRange.cs	2010-10-07 15:32:44 +0000
@@ -5,40 +5,44 @@
 	/// <summary>
 	/// The type which deals with Start and End time for an event.
 	/// </summary>
-	public struct TimeRange
+	public class TimeRange
 	{
-		public TimeRange(DateTime startTime, DateTime endTime)
-		{
-			_begin = startTime;
-			_end = endTime;
+		public TimeRange()
+		{
+		}
+		
+		public TimeRange(Int64 startTime, Int64 endTime)
+		{
+			_begin = ZsUtils.ToDateTime((ulong)startTime);
+			_end = ZsUtils.ToDateTime((ulong)endTime);
 		}
 		/// <summary>
 		/// The begin Timestamp of the event. Seconds elapsed since Epoch
 		/// </summary>
-		public Int64 Begin
+		public DateTime Begin
 		{
 			get
 			{
-				return (Int64)ZsUtils.ToTimestamp(_begin);
+				return _begin;
 			}
 			set
 			{
-				_begin = ZsUtils.ToDateTime((ulong)value);
+				_begin = value;
 			}
 		}
 		
 		/// <summary>
 		/// The end Timestamp of the event. Seconds elapsed since Epoch
 		/// </summary>
-		public Int64 End
+		public DateTime End
 		{
 			get
 			{
-				return (Int64)ZsUtils.ToTimestamp(_end);
+				return _end;
 			}
 			set
 			{
-				_end = ZsUtils.ToDateTime((ulong)value);
+				_end = value;
 			}
 		}
 		
@@ -50,5 +54,40 @@
 		
 		#endregion
 	}
+	
+	internal class RawTimeRange
+	{
+		public Int64 Begin
+		{
+			get
+			{
+				return _begin;
+			}
+			set
+			{
+				_begin = value;
+			}
+		}
+		
+		public Int64 End
+		{
+			get
+			{
+				return _end;
+			}
+			set
+			{
+				_end = value;
+			}
+		}
+		
+		#region Private Fields
+		
+		public Int64 _begin;
+		
+		public Int64 _end;
+		
+		#endregion
+	}
 }
 

=== modified file 'Zeitgeist/LogClient.cs'
--- Zeitgeist/LogClient.cs	2010-09-10 22:14:30 +0000
+++ Zeitgeist/LogClient.cs	2010-10-07 15:32:44 +0000
@@ -73,6 +73,7 @@
 		
 		/// <summary>
 		/// Delete a set of events from the log given their IDs
+		/// If all the Event ID provided does not exist, then null is returned
 		/// </summary>
 		/// <param name="eventIds">
 		/// The eventId (of type <see cref="T:System.Collection.Generic.List{System.UInt32}"/> ) of the Events to be deleted 
@@ -82,7 +83,12 @@
 		/// </returns>
 		public TimeRange DeleteEvents(List<uint> eventIds)
 		{
-			return srcInterface.DeleteEvents(eventIds.ToArray());
+			RawTimeRange rawRange = srcInterface.DeleteEvents(eventIds.ToArray());
+			
+			if(rawRange.Begin < 0 &&  rawRange.End < 0)
+				return null;
+			else
+				return new TimeRange(rawRange.Begin, rawRange.End);
 		}
 		
 		#endregion
@@ -127,7 +133,11 @@
 		{
 			RawEvent[] rawEventTemplates = ZsUtils.ToRawEventList(eventTemplates).ToArray();
 			
-			UInt32[] eventIds = srcInterface.FindEventIds(range, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
+			RawTimeRange rawRange = new RawTimeRange();
+			rawRange.Begin = (long)ZsUtils.ToTimestamp(range.Begin);
+			rawRange.End = (long)ZsUtils.ToTimestamp(range.End);
+			
+			UInt32[] eventIds = srcInterface.FindEventIds(rawRange, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
 			
 			return new List<uint>(eventIds);
 		}
@@ -164,7 +174,11 @@
 		{
 			RawEvent[] rawEventTemplates = ZsUtils.ToRawEventList(eventTemplates).ToArray();
 			
-			RawEvent[] events = srcInterface.FindEvents(range, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
+			RawTimeRange rawRange = new RawTimeRange();
+			rawRange.Begin = (long)ZsUtils.ToTimestamp(range.Begin);
+			rawRange.End = (long)ZsUtils.ToTimestamp(range.End);
+			
+			RawEvent[] events = srcInterface.FindEvents(rawRange, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
 			
 			return ZsUtils.FromRawEventList(events);
 		}
@@ -202,7 +216,11 @@
 			RawEvent[] rawEvents = ZsUtils.ToRawEventList(eventTemplates).ToArray();
 			RawEvent[] rawEventTemplates = ZsUtils.ToRawEventList(resultEventTemplates).ToArray();
 			
-			string[] uris = srcInterface.FindRelatedUris(range, rawEvents, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
+			RawTimeRange rawRange = new RawTimeRange();
+			rawRange.Begin = (long)ZsUtils.ToTimestamp(range.Begin);
+			rawRange.End = (long)ZsUtils.ToTimestamp(range.End);
+			
+			string[] uris = srcInterface.FindRelatedUris(rawRange, rawEvents, rawEventTemplates, (uint)state, maxEvents, (uint) resType);
 			
 			return new List<string>(uris);
 		}
@@ -224,11 +242,16 @@
 		/// Event templates <see cref="T:System.Collection.Generic.List{Zeitgeist.Datamodel.Event}"/> that events must match in order to trigger the monitor 
 		/// </param>
 		public void InstallMonitor(string monitorPath, TimeRange range, List<Event> eventTemplates)
-		{ srcInterface = ZsUtils.GetDBusObject<ILog>(objectPath);
+		{
+			srcInterface = ZsUtils.GetDBusObject<ILog>(objectPath);
+			
+			RawTimeRange rawRange = new RawTimeRange();
+			rawRange.Begin = (long)ZsUtils.ToTimestamp(range.Begin);
+			rawRange.End = (long)ZsUtils.ToTimestamp(range.End);
 			
 			ObjectPath path = new ObjectPath(monitorPath);
 			List<RawEvent> rawEvents = ZsUtils.ToRawEventList(eventTemplates);
-			srcInterface.InstallMonitor(path, range, rawEvents.ToArray());
+			srcInterface.InstallMonitor(path, rawRange, rawEvents.ToArray());
 		}
 		
 		/// <summary>

=== modified file 'Zeitgeist/Zeitgeist.csproj'
--- Zeitgeist/Zeitgeist.csproj	2010-10-05 21:28:08 +0000
+++ Zeitgeist/Zeitgeist.csproj	2010-10-07 15:32:44 +0000
@@ -41,7 +41,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Datamodel\Event.cs" />
     <Compile Include="Datamodel\Subject.cs" />
     <Compile Include="Datamodel\ResultType.cs" />

=== modified file 'Zeitgeist/ZsUtils.cs'
--- Zeitgeist/ZsUtils.cs	2010-10-02 05:20:40 +0000
+++ Zeitgeist/ZsUtils.cs	2010-10-07 15:32:44 +0000
@@ -190,8 +190,17 @@
 			
 			return interfaceInst;
 		}
+		
+		public static string GetStringAnchor(string str)
+		{
+			if(str != null)
+			{
+				int pos = str.IndexOf('#');
+				return str.Substring(pos+1);
+			}
+			else
+				return null;
+		}
 	}
-	
-	
 }