update tests

ceee · Apr 9, 2018 · ed087ff · ed087ff
1 parent e3b571d
commit ed087ff
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 266 deletions.
diff --git a/PocketSharp.Tests/AccountTests.cs b/PocketSharp.Tests/AccountTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -16,8 +16,8 @@ public async Task IsRegistrationURLSuccessfullyCreated()
 
       Uri uri = client.GenerateRegistrationUri(requestCode);
 
-      Assert.True(uri.OriginalString.Contains(requestCode));
-      Assert.True(uri.OriginalString.Contains("force=signup"));
+      Assert.Contains(requestCode, uri.OriginalString);
+      Assert.Contains("force=signup", uri.OriginalString);
     }
   }
 }
diff --git a/PocketSharp.Tests/AddTests.cs b/PocketSharp.Tests/AddTests.cs
@@ -1,4 +1,4 @@
-using PocketSharp.Models;
+using PocketSharp.Models;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -61,7 +61,7 @@ public async Task AddComplexItem()
 
       Assert.NotNull(itemDesired);
       Assert.Equal(itemDesired.ID, item.ID);
-      Assert.Equal(itemDesired.Tags.Count(), 3);
+      Assert.Equal(3, itemDesired.Tags.Count());
 
       itemsToDelete.Add(item.ID);
     }

diff --git a/PocketSharp.Tests/DefaultAccount.playlist b/PocketSharp.Tests/DefaultAccount.playlist
diff --git a/PocketSharp.Tests/GetTests.cs b/PocketSharp.Tests/GetTests.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Schema;
 using PocketSharp.Models;
 using System;
@@ -80,8 +80,8 @@ public async Task ItemContainsUri()
     {
       IEnumerable<PocketItem> items = await client.Get(count: 1);
 
-      Assert.True(items.Count() == 1);
-      Assert.True(items.First().Uri.ToString().StartsWith("http"));
+      Assert.True(1 == items.Count());
+      Assert.StartsWith("http", items.First().Uri.OriginalString);
     }
 
 
@@ -111,7 +111,7 @@ public async Task SearchReturnsResult()
       IEnumerable<PocketItem> items = await client.Search("pocket");
 
       Assert.True(items.Count() > 0);
-      Assert.True(items.First().FullTitle.ToLower().Contains("pocket"));
+      Assert.Contains("pocket", items.First().FullTitle.ToLower());
     }
 
 

diff --git a/PocketSharp.Tests/ModifyTagsTests.cs b/PocketSharp.Tests/ModifyTagsTests.cs
@@ -1,4 +1,4 @@
-using PocketSharp.Models;
+using PocketSharp.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -63,7 +63,7 @@ public async Task AreTagsReplaced()
 
       item = await GetItemById(item.ID);
 
-      Assert.Equal(item.Tags.Count(), 2);
+      Assert.Equal(2, item.Tags.Count());
 
       Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag"));
       Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag2"));