From ed087ffdf5c4eae37109a1ed7f9f3b7b01f1b03a Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Mon, 9 Apr 2018 12:18:45 +0200 Subject: [PATCH] update tests --- PocketSharp.Tests/AccountTests.cs | 6 +- PocketSharp.Tests/AddTests.cs | 4 +- PocketSharp.Tests/DefaultAccount.playlist | 1 - PocketSharp.Tests/GetTests.cs | 8 +- PocketSharp.Tests/ModifyTagsTests.cs | 4 +- PocketSharp.Tests/PocketSharp.Tests.csproj | 189 ++++--------------- PocketSharp.Tests/Properties/AssemblyInfo.cs | 36 ---- PocketSharp.Tests/StressAccount.playlist | 1 - PocketSharp.Tests/StressTests.cs | 6 +- PocketSharp.Tests/packages.config | 47 ----- PocketSharp.sln | 34 ++-- 11 files changed, 65 insertions(+), 271 deletions(-) delete mode 100644 PocketSharp.Tests/DefaultAccount.playlist delete mode 100644 PocketSharp.Tests/Properties/AssemblyInfo.cs delete mode 100644 PocketSharp.Tests/StressAccount.playlist delete mode 100644 PocketSharp.Tests/packages.config diff --git a/PocketSharp.Tests/AccountTests.cs b/PocketSharp.Tests/AccountTests.cs index 7733159..03e2a07 100644 --- 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 @@ namespace PocketSharp.Tests 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 index 8093d19..89e215f 100644 --- 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 @@ namespace PocketSharp.Tests 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 deleted file mode 100644 index 4d904f6..0000000 --- a/PocketSharp.Tests/DefaultAccount.playlist +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/PocketSharp.Tests/GetTests.cs b/PocketSharp.Tests/GetTests.cs index 8029976..fe8b2f9 100644 --- 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 @@ namespace PocketSharp.Tests { IEnumerable 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 @@ namespace PocketSharp.Tests IEnumerable 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 index f1ebf0e..c068608 100644 --- 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 @@ namespace PocketSharp.Tests item = await GetItemById(item.ID); - Assert.Equal(item.Tags.Count(), 2); + Assert.Equal(2, item.Tags.Count()); Assert.NotNull(item.Tags.SingleOrDefault(tag => tag.Name == "test_tag")); Assert.NotNull(item.Tags.SingleOrDefault(tag => tag.Name == "test_tag2")); diff --git a/PocketSharp.Tests/PocketSharp.Tests.csproj b/PocketSharp.Tests/PocketSharp.Tests.csproj index 1c08f2b..37e0eb5 100644 --- a/PocketSharp.Tests/PocketSharp.Tests.csproj +++ b/PocketSharp.Tests/PocketSharp.Tests.csproj @@ -1,162 +1,37 @@ - - - - + + - Debug - AnyCPU - {CA3C491B-A8CA-426C-A0BB-E91636767467} - Library - Properties - PocketSharp.Tests - PocketSharp.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - ..\ - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp2.0 + + false + - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - - - - - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - - - ..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + ..\PocketSharp\bin\Debug\netstandard2.0\PocketSharp.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - - - False - - - False - - - False - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/PocketSharp.Tests/Properties/AssemblyInfo.cs b/PocketSharp.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index e85e4fb..0000000 --- a/PocketSharp.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PocketSharp.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PocketSharp.Tests")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("87fcf138-5e6e-4584-ac3b-58c8ee6fccaa")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/PocketSharp.Tests/StressAccount.playlist b/PocketSharp.Tests/StressAccount.playlist deleted file mode 100644 index df4600c..0000000 --- a/PocketSharp.Tests/StressAccount.playlist +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/PocketSharp.Tests/StressTests.cs b/PocketSharp.Tests/StressTests.cs index 108a54e..9ed62a4 100644 --- a/PocketSharp.Tests/StressTests.cs +++ b/PocketSharp.Tests/StressTests.cs @@ -1,4 +1,4 @@ -using PocketSharp.Models; +using PocketSharp.Models; using System; using System.Collections.Generic; using System.IO; @@ -91,7 +91,7 @@ namespace PocketSharp.Tests items.ForEach(tag => { - Assert.True(tags.Contains(tag.Name)); + Assert.Contains(tag.Name, tags); }); Assert.Equal(items.Count, tags.Length); @@ -128,4 +128,4 @@ namespace PocketSharp.Tests // await FillAccount(11000, 89999); //} } -} \ No newline at end of file +} diff --git a/PocketSharp.Tests/packages.config b/PocketSharp.Tests/packages.config deleted file mode 100644 index 7c70fe3..0000000 --- a/PocketSharp.Tests/packages.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/PocketSharp.sln b/PocketSharp.sln index 4523382..e40fba4 100644 --- a/PocketSharp.sln +++ b/PocketSharp.sln @@ -11,11 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19DD45 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{CA3C491B-A8CA-426C-A0BB-E91636767467}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.UWP", "PocketSharp.Examples\PocketSharp.UWP\PocketSharp.UWP.csproj", "{5CBB92EC-C1A2-4108-9A23-3B73DD138953}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{0E22926C-7244-4A17-923C-84B46F5149C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{0E22926C-7244-4A17-923C-84B46F5149C0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,18 +29,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|ARM.ActiveCfg = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x64.ActiveCfg = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x64.Build.0 = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.Build.0 = Release|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|ARM.ActiveCfg = Release|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x64.ActiveCfg = Release|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x64.Build.0 = Release|Any CPU - {CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x86.ActiveCfg = Release|Any CPU {5CBB92EC-C1A2-4108-9A23-3B73DD138953}.Debug|Any CPU.ActiveCfg = Debug|x86 {5CBB92EC-C1A2-4108-9A23-3B73DD138953}.Debug|Any CPU.Build.0 = Debug|x86 {5CBB92EC-C1A2-4108-9A23-3B73DD138953}.Debug|Any CPU.Deploy.0 = Debug|x86 @@ -79,6 +67,22 @@ Global {0E22926C-7244-4A17-923C-84B46F5149C0}.Release|x64.Build.0 = Release|Any CPU {0E22926C-7244-4A17-923C-84B46F5149C0}.Release|x86.ActiveCfg = Release|Any CPU {0E22926C-7244-4A17-923C-84B46F5149C0}.Release|x86.Build.0 = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|ARM.Build.0 = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|x64.Build.0 = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Debug|x86.Build.0 = Debug|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|Any CPU.Build.0 = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|ARM.ActiveCfg = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|ARM.Build.0 = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|x64.ActiveCfg = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|x64.Build.0 = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|x86.ActiveCfg = Release|Any CPU + {3BAA93AD-3B5C-47C4-816B-F29A1E6D1C2D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE