daniel
/
zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Fix additional tests.

This commit is contained in:
daniel 2016-10-03 16:09:43 +02:00
parent ba07293385
commit e190e85b89
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/Importer/ZaaImporter/LaurisItemTest.cs
View File

@ -153,7 +153,7 @@ namespace Tests.Importer.ZaaImporter
[TestCase("Albumin (SU)/die: 149.9 [<= 30] mg/d; ", Material.SU)] [TestCase("Albumin (SU)/die: 149.9 [<= 30] mg/d; ", Material.SU)]
[TestCase("Gesamt-Eiweiss/Creatinin (PU): 281 [<= 70] mg/g Crea;", Material.U)] [TestCase("Gesamt-Eiweiss/Creatinin (PU): 281 [<= 70] mg/g Crea;", Material.U)]
[TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.B)] [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.S)]
public void ParseLaurisMaterial(string laurisString, Material expectedMaterial) public void ParseLaurisMaterial(string laurisString, Material expectedMaterial)
{ {
LaurisItem i = new LaurisItem(laurisString); LaurisItem i = new LaurisItem(laurisString);

13
zaaReloaded2/LabModel/LabItem.cs
View File

@ -206,13 +206,14 @@ namespace zaaReloaded2.LabModel
{ {
get get
{ {
if (Material == LabModel.Material.B) switch (Material)
{ {
return Name; case Material.S:
} case Material.E:
else case Material.B:
{ return Name;
return String.Format("{0}-{1}", Material.ToString(), Name); default:
return String.Format("{0}-{1}", Material.ToString(), Name);
} }
} }
} }