Merge branch 'item-comments' into develop

Conflicts:
	zaaReloaded2/Formatter/Formatter.cs
	zaaReloaded2/zaaReloaded2.csproj

Tests/Controller/Comments/CommentPoolTest.cs

@@ -0,0 +1,60 @@
+/* CommentPoolTest.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015 Daniel Kraus
+ * 
+ * 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.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using zaaReloaded2.Controller.Comments;
+
+namespace Tests.Controller.Comments
+{
+    [TestFixture]
+    class CommentPoolTest
+    {
+        [Test]
+        public void CreateCommentIfDoesNotExist()
+        {
+            int n = CommentPool.Default.Count;
+            ItemComment i = CommentPool.Default.GetCommentFor("item \"<>\"");
+            Assert.AreEqual(n + 1, CommentPool.Default.Count);
+        }
+
+        [Test]
+        public void ReturnExistingComment()
+        {
+            ItemComment i = CommentPool.Default.GetCommentFor("item \"<>\"");
+            int n = CommentPool.Default.Count;
+            i = CommentPool.Default.GetCommentFor("item \"<>\"");
+            Assert.AreEqual(n, CommentPool.Default.Count);
+        }
+
+        [Test]
+        public void BuildingCommentRaisesEvent()
+        {
+            ItemComment i = CommentPool.Default.GetCommentFor("item \"<>\"");
+            int eventRaised = 0;
+            CommentPool.Default.FillInComment += (sender, args) =>
+            {
+                eventRaised += 1;
+            };
+            string comment = i.BuildComment();
+            Assert.AreEqual(1, eventRaised);
+        }
+    }
+}

Tests/Controller/Comments/ItemCommentTest.cs

@@ -0,0 +1,58 @@
+/* ItemCommentTest.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015 Daniel Kraus
+ * 
+ * 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.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using zaaReloaded2.Formatter;
+using zaaReloaded2.Controller.Comments;
+
+namespace Tests.Controller.Comments
+{
+    [TestFixture]
+    class ItemCommentTest
+    {
+        [Test]
+        public void FactoryWithGoodDefinition()
+        {
+            ItemComment i = ItemComment.FromDefinitionString("TAC \"(Zielbereich: <4-7> µg/l)\"");
+            Assert.IsNotNull(i);
+            Assert.AreEqual("(Zielbereich: ", i.Prefix);
+            Assert.AreEqual("4-7", i.Value);
+            Assert.AreEqual(" µg/l)", i.Suffix);
+            Assert.AreEqual("TAC", i.Item);
+            Assert.AreEqual("(Zielbereich: 4-7 µg/l)", i.BuildComment());
+        }
+
+        [Test]
+        public void FactoryWithBadDefinition()
+        {
+            ItemComment i = ItemComment.FromDefinitionString("some bogus definition");
+            Assert.IsNull(i);
+        }
+
+        [Test]
+        public void EmptyValueProducesEmptyComment()
+        {
+            ItemComment i = ItemComment.FromDefinitionString("TAC \"(Zielbereich: <default> µg/l)\"");
+            i.Value = String.Empty;
+            Assert.AreEqual(String.Empty, i.BuildComment());
+        }
+    }
+}

Tests/Controller/Elements/ItemsTest.cs

@@ -16,14 +16,12 @@
  * limitations under the License.
  */
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using NUnit.Framework;
 using Microsoft.Office.Interop.Word;
 using zaaReloaded2.LabModel;
 using zaaReloaded2.Formatter;
 using zaa = zaaReloaded2.Controller.Elements;
+using zaaReloaded2.Controller.Comments;
 using System.Text.RegularExpressions;
 
 namespace Tests.Controller.Elements
@@ -152,7 +150,7 @@ namespace Tests.Controller.Elements
                 StripMarkup(
                     TimePointFormatter.DateAndTimeHeader(new DateTime(2015, 07, 13, 13, 31, 00))
                 )+
-                "Klinische Chemie: Na 133, SU-Protein 2,8\r\r").Replace(Environment.NewLine, "\r");
+                "Klinische Chemie: Na 133, SU-Protein 3\r\r").Replace(Environment.NewLine, "\r");
             Assert.AreEqual(expected, _document.Range().Text);
         }
 
@@ -176,11 +174,62 @@ namespace Tests.Controller.Elements
                 StripMarkup(
                     TimePointFormatter.DateAndTimeHeader(new DateTime(2015, 07, 13, 13, 31, 00))
                 ) +
-                "Klinische Chemie: Na 133, SU-Protein 2,8, Cl 110, U-Na 99\r\r")
+                "Klinische Chemie: Na 133, SU-Protein 3, Cl 110, U-Na 99\r\r")
                 .Replace(Environment.NewLine, "\r");
             Assert.AreEqual(expected, _document.Range().Text);
         }
 
+        [Test]
+        public void ItemCommentWithoutHandler()
+        {
+            Laboratory lab = new Laboratory();
+            TimePoint tp = new TimePoint();
+            tp.TimeStamp = new DateTime(2015, 7, 13, 13, 31, 00);
+            tp.AddItem(new LabItem("Na", "133", "133"));
+            tp.AddItem(new LabItem("K", "6", "5"));
+            lab.AddTimePoint(tp);
+
+            _formatter.Laboratory = lab;
+            _formatter.Settings.Elements.Add(
+                new zaa.Items("Na \"(Zielbereich: <> mmol/l)\""));
+            _formatter.Run();
+            string expected = (
+                StripMarkup(
+                    TimePointFormatter.DateAndTimeHeader(new DateTime(2015, 07, 13, 13, 31, 00)) +
+                    "Na 133\r\r").Replace(Environment.NewLine, "\r")
+                );
+            Assert.AreEqual(expected, _document.Range().Text);
+        }
+
+        [Test]
+        public void ItemCommentWithHandler()
+        {
+            Laboratory lab = new Laboratory();
+            TimePoint tp = new TimePoint();
+            tp.TimeStamp = new DateTime(2015, 7, 13, 13, 31, 00);
+            tp.AddItem(new LabItem("Na", "133", "133"));
+            tp.AddItem(new LabItem("K", "6", "5"));
+            lab.AddTimePoint(tp);
+
+            _formatter.Laboratory = lab;
+            _formatter.Settings.Elements.Add(
+                new zaa.Items("Na \"(Zielbereich: <default> µg/l)\""));
+            bool messageSent = false;
+            CommentPool.Default.FillInComment += (sender, args) =>
+            {
+                messageSent = true;
+                args.Comment.Value = "4-7";
+            };
+            _formatter.Run();
+            Assert.IsTrue(messageSent, "FillInComment message was not sent");
+            string expected = (
+                StripMarkup(
+                    TimePointFormatter.DateAndTimeHeader(new DateTime(2015, 07, 13, 13, 31, 00)) +
+                    "Na 133 (Zielbereich: 4-7 µg/l)\r\r").Replace(Environment.NewLine, "\r")
+                );
+            Assert.AreEqual(expected, _document.Range().Text);
+        }
+
         static string StripMarkup(string s)
         {
             return _markupStripper.Replace(s, string.Empty);

Tests/Tests.csproj

@@ -80,6 +80,8 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="Controller\Comments\CommentPoolTest.cs" />
+    <Compile Include="Controller\Comments\ItemCommentTest.cs" />
     <Compile Include="SerializationTest.cs" />
     <Compile Include="Controller\SettingsRepositoryTest.cs" />
     <Compile Include="Controller\SettingsTest.cs" />
@@ -96,6 +98,7 @@
     <Compile Include="Importer\ZaaImporter\TimePointTest.cs" />
     <Compile Include="TestHelpers.cs" />
     <Compile Include="ViewModels\ElementPickerViewModelTest.cs" />
+    <Compile Include="ViewModels\ItemCommentViewModelTest.cs" />
     <Compile Include="ViewModels\SettingsRepositoryViewModelTest.cs" />
     <Compile Include="ViewModels\SettingsViewModelTest.cs" />
   </ItemGroup>

Tests/ViewModels/ItemCommentViewModelTest.cs

@@ -0,0 +1,42 @@
+/* ItemCommentViewModelTest.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015 Daniel Kraus
+ * 
+ * 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.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using zaaReloaded2.Controller.Comments;
+using zaaReloaded2.ViewModels;
+
+namespace Tests.ViewModels
+{
+    [TestFixture]
+    class ItemCommentViewModelTest
+    {
+        [Test]
+        public void Properties()
+        {
+            ItemComment comment = new ItemComment("item", "pre", "val", "suf");
+            ItemCommentViewModel vm = new ItemCommentViewModel(comment);
+            Assert.AreEqual(comment.Item, vm.Item);
+            Assert.AreEqual(comment.Prefix, vm.Prefix);
+            Assert.AreEqual(comment.Suffix, vm.Suffix);
+            Assert.AreEqual(comment.Value, vm.Value);
+        }
+    }
+}