Merge pull request #20 from RusticiSoftware/tfo/improvement/activityid-uri-string

Switch to String from Uri for Representing Activity IDs

Author: brianjmiller

TinCan/Activity.cs

@@ -24,7 +24,17 @@ public class Activity : JsonModel, StatementTarget
         public static readonly String OBJECT_TYPE = "Activity";
         public String ObjectType { get { return OBJECT_TYPE; } }
 
-        public Uri id { get; set; }
+        private string _id;
+        public string id
+        {
+            get { return _id; }
+            set
+            {
+                Uri uri = new Uri(value);
+                _id = value;
+            }
+        }
+
         public ActivityDefinition definition { get; set; }
 
         public Activity() { }
@@ -35,7 +45,9 @@ public Activity(JObject jobj)
         {
             if (jobj["id"] != null)
             {
-                id = new Uri(jobj.Value<String>("id"));
+                string idFromJSON = jobj.Value<String>("id");
+                Uri uri = new Uri(idFromJSON);
+                id = idFromJSON;
             }
             if (jobj["definition"] != null)
             {
@@ -50,7 +62,7 @@ public override JObject ToJObject(TCAPIVersion version)
 
             if (id != null)
             {
-                result.Add("id", id.ToString());
+                result.Add("id", id);
             }
             if (definition != null)
             {

TinCan/StatementsQuery.cs

@@ -25,7 +25,15 @@ public class StatementsQuery
 
         public Agent agent { get; set; }
         public Uri verbId { get; set; }
-        public Uri activityId { get; set; }
+        private string _activityId;
+        public string activityId {
+            get { return _activityId; }
+            set
+            {
+                Uri uri = new Uri(value);
+                _activityId = value;
+            }
+        }
         public Nullable<Guid> registration { get; set; }
         public Nullable<Boolean> relatedActivities { get; set; }
         public Nullable<Boolean> relatedAgents { get; set; }
@@ -51,7 +59,7 @@ public Dictionary<String, String> ToParameterMap (TCAPIVersion version)
             }
             if (activityId != null)
             {
-                result.Add("activity", activityId.ToString());
+                result.Add("activity", activityId);
             }
             if (registration != null)
             {

TinCanTests/ActivityTest.cs

@@ -0,0 +1,51 @@
+/*
+    Copyright 2014 Rustici Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+namespace TinCanTests
+{
+    using NUnit.Framework;
+    using TinCan;
+
+    [TestFixture]
+    class ActivityTest
+    {
+        [Test]
+        public void TestActivityIdTrailingSlash()
+        {
+            var activity = new Activity();
+            string noTrailingSlash = "http://foo";
+            activity.id = noTrailingSlash;
+            Assert.AreEqual(noTrailingSlash, activity.id);
+        }
+
+        [Test]
+        public void TestActivityIdCase()
+        {
+            var activity = new Activity();
+            string mixedCase = "http://fOO";
+            activity.id = mixedCase;
+            Assert.AreEqual(mixedCase, activity.id);
+        }
+
+        [Test]
+        [ExpectedException("System.UriFormatException")]
+        public void TestActivityIdInvalidUri()
+        {
+            var activity = new Activity();
+            string invalid = "foo";
+            activity.id = invalid;
+        }
+    }
+}

TinCanTests/Support.cs

@@ -40,7 +40,7 @@ static Support () {
             verb.display.Add("en-US", "experienced");
 
             activity = new Activity();
-            activity.id = new Uri("http://tincanapi.com/TinCanCSharp/Test/Unit/0");
+            activity.id = "http://tincanapi.com/TinCanCSharp/Test/Unit/0";
             activity.definition = new ActivityDefinition();
             activity.definition.type = new Uri("http://id.tincanapi.com/activitytype/unit-test");
             activity.definition.name = new LanguageMap();
@@ -49,7 +49,7 @@ static Support () {
             activity.definition.description.Add("en-US", "Unit test 0 in the test suite for the Tin Can C# library.");
 
             parent = new Activity();
-            parent.id = new Uri("http://tincanapi.com/TinCanCSharp/Test");
+            parent.id = "http://tincanapi.com/TinCanCSharp/Test";
             parent.definition = new ActivityDefinition();
             parent.definition.type = new Uri("http://id.tincanapi.com/activitytype/unit-test-suite");
             //parent.definition.moreInfo = new Uri("http://rusticisoftware.github.io/TinCanCSharp/");

TinCanTests/TinCanTests.csproj

@@ -71,6 +71,7 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ActivityTest.cs" />
     <Compile Include="AgentTest.cs" />
     <Compile Include="ResultTest.cs" />
     <Compile Include="Support.cs" />