Merge pull request #123 from Standaard-boos/TreeAgeBugFix

Bugfix?

Author: RillJ

…odel_MainDecisiontree_GetListReturned.cs …iewModel_Decisiontree_GetListReturned.csViewModel.Test/ViewModel_MainDecisiontree_GetListReturned.cs renamed to ViewModel.Test/ViewModel_Decisiontree_GetListReturned.cs ViewModel.Test/ViewModel_MainDecisiontree_GetListReturned.cs renamed to ViewModel.Test/ViewModel_Decisiontree_GetListReturned.cs

@@ -1,21 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Model;
 using NuGet.Frameworks;
 using NUnit.Framework;
 
 namespace ViewModel.Test
 {
-    public class ViewModel_MainDecisiontree_GetListReturned
+    public class ViewModel_Decisiontree_GetListReturned
     {
         [SetUp]
         public void Setup()
         {
             InitialSetupForTests.ClearFieldsInAccount();
-            Account.Email = "test@mail.com";
+            Account.Email = "UnitTest1@windesheim.nl";
             Account.Authenticated = true;
-            Account.UserID = 1;
+            Account.UserID = 176;
         }
 
 
@@ -25,5 +26,15 @@ public void GetListOfPotentialMatches_NotNull()
             var result = Helpers.Decisiontree.MainDecisionTree.GetProfilesBasedOnIntrestAndNormsAndValues(Account.UserID.Value);
             Assert.NotNull(result);
         }
+
+
+        [Test]
+        public void AccountUnitTestInTopList()
+        {
+            Helpers.Decisiontree.MainDecisionTree.GetProfilesBasedOnIntrestAndNormsAndValues(Account.UserID.Value);
+            var result = Helpers.Decisiontree.MainDecisionTree.BestMatch;
+            Assert.That(result.Any(p => p.LastName.Equals("Test2")));
+            Assert.That(result.Any(p => p.LastName.Equals("Test3")));
+        }
     }
 }

ViewModel/Helpers/Decisiontree/Methodes/SameAgeCheck.cs

@@ -34,7 +34,7 @@ public static bool CheckSameAge(Profile pf, Profile liupf)
         /// <returns>true or false</returns>
         private static bool CheckAge(Profile pf, Profile liupf)
         {
-            if (String.IsNullOrEmpty(pf.Age))
+            if (String.IsNullOrEmpty(pf.Age) || String.IsNullOrEmpty(liupf.Age))
             {
                 return false;
             }

ViewModel/Helpers/Decisiontree/Methodes/SameSchoolCheck.cs

@@ -16,12 +16,12 @@ public static class SameSchoolCheck
         public static bool CheckSameSchool(School pfSchool , School logedInUserSchool)
         {
 
-            if (pfSchool == null)
+            if (logedInUserSchool == null || pfSchool == null)
             {
                 return false;
             }
 
-            if (pfSchool.SchoolName.Equals(logedInUserSchool.SchoolName))
+            if (pfSchool.SchoolName == logedInUserSchool.SchoolName)
             {
                 MainDecisionTree.Score += 5;
                 return true;