diff --git a/HISTORY.md b/HISTORY.md index edfaa13..a0cae6f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +Version 2.1.3 (2015-09-18) +======================================================================== + +- VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf. +- VERBESSERT: Extreme Werte (mit "<" oder ">") wurden nicht sehr schön formatiert. + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + + Version 2.1.2 (2015-09-11) ======================================================================== diff --git a/Tests/Importer/ZaaImporter/LaurisItemTest.cs b/Tests/Importer/ZaaImporter/LaurisItemTest.cs index 3f58977..47383c9 100755 --- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs +++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs @@ -40,6 +40,7 @@ namespace Tests.Importer.ZaaImporter LaurisItem i = new LaurisItem(laurisString); Assert.AreEqual(name, i.Name, "Name"); Assert.AreEqual(unit, i.Unit, "Unit"); + Assert.IsFalse(i.IsExtreme, "IsExtreme"); Assert.IsTrue(i.IsNumerical, "IsNumerical"); Assert.AreEqual(value, i.NumericalValue, "NumericalValue"); Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit"); @@ -50,6 +51,25 @@ namespace Tests.Importer.ZaaImporter Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit"); } + [TestCase("Folsäure: > 20 [2.0 - 9.1] ng/ml; ", "Folsäure", "> 20", "ng/ml", 2, 9.1, false)] + public void ParseLaurisWithGreaterOrLowerValue( + string laurisString, string name, string value, + string unit, double lowerLimit, double upperLimit, bool isNormal) + { + LaurisItem i = new LaurisItem(laurisString); + Assert.AreEqual(name, i.Name, "Name"); + Assert.AreEqual(unit, i.Unit, "Unit"); + Assert.IsTrue(i.IsExtreme, "IsExtreme"); + Assert.IsFalse(i.IsNumerical, "IsNumerical"); + Assert.AreEqual(value, i.Value, "Value"); + Assert.AreEqual(lowerLimit, i.LowerLimit, "Lower limit"); + Assert.AreEqual(upperLimit, i.UpperLimit, "Upper limit"); + Assert.AreEqual(isNormal, i.IsNormal, "IsNormal"); + Assert.IsTrue(i.HasLimits, "HasLimits"); + Assert.IsTrue(i.HasLowerLimit, "HasLowerLimit"); + Assert.IsTrue(i.HasUpperLimit, "HasUpperLimit"); + } + [TestCase("HDL - Cholesterin: 45 [>= 35] mg/dl", "HDL - Cholesterin", 45, "mg/dl", 35, true)] public void ParseLaurisWithLowerLimit( string laurisString, string name, double value, diff --git a/www/index.html b/www/index.html index c2a643f..5396233 100644 --- a/www/index.html +++ b/www/index.html @@ -22,9 +22,7 @@ zaaReloaded2 - +