Fixed failing UTs

Richasy · Aug 31, 2017 · 7778b4f · 7778b4f
1 parent 449a4c9
commit 7778b4f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/EverythingNet.Tests/AcceptanceTests.cs b/EverythingNet.Tests/AcceptanceTests.cs
@@ -7,6 +7,8 @@
 
 namespace EverythingNet.Tests
 {
+  using System.Linq;
+
   [TestFixture]
   public class AcceptanceTests
   {
@@ -33,10 +35,8 @@ public void Query()
         .Or
         .Name("SearchResult.cs");
 
-      foreach (var s in queryable)
-      {
-        Assert.That(s, Is.Not.Empty);
-      }
+      Assert.That(queryable.Where(x => x.FileName == "AcceptanceTests.cs"), Is.Not.Empty);
+      Assert.That(queryable.Where(x => x.FileName == "SearchResult.cs"), Is.Not.Empty);
     }
 
     [Test]
@@ -61,7 +61,7 @@ public void SearchGetFileName()
 
       foreach (var result in queryable)
       {
-        Assert.That(result.FileName, Is.EqualTo("AcceptanceTests"));
+        Assert.That(result.FileName, Is.EqualTo("AcceptanceTests.cs"));
       }
     }
 

diff --git a/EverythingNet/Core/SearchResult.cs b/EverythingNet/Core/SearchResult.cs
@@ -30,12 +30,24 @@ public string FullPath
 
     public string Path
     {
-      get { return EverythingWrapper.Everything_GetResultPath(this.index); }
+      get
+      {
+        //return EverythingWrapper.Everything_GetResultPath(this.index);
+
+        // Temporary implementation until the native function works as expected
+        return System.IO.Path.GetDirectoryName(this.FullPath);
+      }
     }
 
     public string FileName
     {
-      get { return EverythingWrapper.Everything_GetResultFileName(this.index); }
+      get
+      {
+        //return EverythingWrapper.Everything_GetResultFileName(this.index);
+
+        // Temporary implementation until the native function works as expected
+        return System.IO.Path.GetFileName(this.FullPath);
+      }
     }
 
     public long Size