Added additional netcoreapp3.1 target framework for testing

Author: johelvisguzman

test/DotNetToolkit.Repository.Test/App.config

@@ -12,7 +12,7 @@
     <loggingProvider type="DotNetToolkit.Repository.Configuration.Logging.ConsoleLoggerProvider, DotNetToolkit.Repository">
       <param name="minLogLevel" value="Debug" />
     </loggingProvider>
-    <cachingProvider type="DotNetToolkit.Repository.Caching.InMemory.InMemoryCacheProvider, DotNetToolkit.Repository.Caching.InMemory">
+    <cachingProvider type="DotNetToolkit.Repository.Test.Data.TestCacheProvider, DotNetToolkit.Repository.Test">
       <expiry value="00:00:30" />
     </cachingProvider>
     <interceptors>

test/DotNetToolkit.Repository.Test/Data/TestCacheProvider.cs

@@ -0,0 +1,14 @@
+namespace DotNetToolkit.Repository.Test.Data
+{
+    using Configuration.Caching;
+    using System;
+
+    public class TestCacheProvider : ICacheProvider
+    {
+        public ICacheKeyTransformer KeyTransformer { get; set; }
+
+        public TimeSpan? Expiry { get; set; }
+
+        public ICache Cache { get; set; }
+    }
+}

test/DotNetToolkit.Repository.Test/Data/TestConfigurationHelper.cs

@@ -1,4 +1,5 @@
-namespace DotNetToolkit.Repository.Integration.Test.Data
+#if NETSTANDARD2_0
+namespace DotNetToolkit.Repository.Test.Data
 {
     using Microsoft.Extensions.Configuration;
     using System;
@@ -14,3 +15,4 @@ public static IConfigurationRoot GetConfiguration(string fileName = "appsettings
         }
     }
 }
+#endif

test/DotNetToolkit.Repository.Test/DotNetToolkit.Repository.Test.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -15,24 +15,36 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
-  
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>NETFULL</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DotNetToolkit.Repository.Caching.InMemory\DotNetToolkit.Repository.Caching.InMemory.csproj" />
-    <ProjectReference Include="..\..\src\DotNetToolkit.Repository.InMemory\DotNetToolkit.Repository.InMemory.csproj" />
-    <ProjectReference Include="..\..\src\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <ProjectReference Include="..\..\src\DotNetToolkit.Repository.InMemory\DotNetToolkit.Repository.InMemory.csproj" />
+    <ProjectReference Include="..\..\src\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -50,4 +62,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>

test/DotNetToolkit.Repository.Test/Tests/OptionsBuilderTests.cs

@@ -1,6 +1,5 @@
 namespace DotNetToolkit.Repository.Test
 {
-    using Caching.InMemory;
     using Configuration.Logging;
     using Configuration.Options;
     using Data;
@@ -119,15 +118,16 @@ public void ConfigureCachingProvider()
 
             Assert.False(optionsBuilder.IsConfigured);
 
-            optionsBuilder.UseCachingProvider(new InMemoryCacheProvider());
+            optionsBuilder.UseCachingProvider(new TestCacheProvider());
 
             Assert.True(optionsBuilder.IsConfigured);
 
             Assert.NotNull(optionsBuilder.Options.CachingProvider);
         }
 
+#if NETFULL
         [Fact]
-        public void ConfigureFromAppConfig()
+        public void ConfigureFromXml()
         {
             var optionsBuilder = new RepositoryOptionsBuilder();
 
@@ -141,7 +141,7 @@ public void ConfigureFromAppConfig()
         }
 
         [Fact]
-        public void ConfigureFromRepositoryConfig()
+        public void ConfigureFromFile()
         {
             var optionsBuilder = new RepositoryOptionsBuilder();
 
@@ -153,10 +153,9 @@ public void ConfigureFromRepositoryConfig()
 
             TestConfiguration(optionsBuilder);
         }
-
-#if NETSTANDARD
+#else
         [Fact]
-        public void ConfigureFromAppSetting()
+        public void ConfigureFromJson()
         {
             var optionsBuilder = new RepositoryOptionsBuilder();
 
@@ -167,10 +166,10 @@ public void ConfigureFromAppSetting()
             Assert.True(optionsBuilder.IsConfigured);
 
             TestConfiguration(optionsBuilder);
-        } 
+        }
 #endif
 
-
+#if NETFULL
         [Fact]
         public void ThrowsIfConfigureFromRepositoryConfigNotFound()
         {
@@ -181,17 +180,19 @@ public void ThrowsIfConfigureFromRepositoryConfigNotFound()
             Assert.Equal("The file is not found.", ex.Message);
             Assert.Equal("random.config", ex.FileName);
         }
+#endif
 
         [Fact]
         public void ThrowsIfConfigurationSectionNotFound()
         {
-            var ex = Assert.Throws<InvalidOperationException>(
+            Exception ex;
+#if NETFULL
+            ex = Assert.Throws<InvalidOperationException>(
                 () => new RepositoryOptionsBuilder()
                     .UseConfiguration("empty_repository.config"));
 
             Assert.Equal("Unable to find a 'repository' configuration section. For more information on DotNetToolkit.Repository configuration, visit the https://github.com/johelvisguzman/DotNetToolkit.Repository/wiki/Config-File-Setup.", ex.Message);
-
-#if NETSTANDARD
+#else
             ex = Assert.Throws<InvalidOperationException>(
                     () => new RepositoryOptionsBuilder()
                         .UseConfiguration(TestConfigurationHelper.GetConfiguration("empty_repository.json")));
@@ -215,7 +216,7 @@ private static void TestConfiguration(RepositoryOptionsBuilder optionsBuilder)
 
             // logging provider
             Assert.NotNull(optionsBuilder.Options.LoggerProvider);
-            
+
             // caching provider
             Assert.NotNull(optionsBuilder.Options.CachingProvider);
             Assert.Equal(optionsBuilder.Options.CachingProvider.Expiry, TimeSpan.FromSeconds(30));
@@ -230,4 +231,4 @@ private static void TestConfiguration(RepositoryOptionsBuilder optionsBuilder)
             Assert.True(interceptor.P2);
         }
     }
-}
+}

test/DotNetToolkit.Repository.Test/Tests/QueryOptionsTests.cs

@@ -33,14 +33,27 @@ public void Page()
             Assert.Equal(pageIndex, ((IQueryOptions<Customer>)options).PageIndex);
             Assert.Equal(pageSize, ((IQueryOptions<Customer>)options).PageSize);
 
-            var ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(0, 1));
+            Exception ex;
+
+#if NETFULL
+            ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(0, 1));
             Assert.Equal("Cannot be lower than 1.\r\nParameter name: pageIndex", ex.Message);
 
             ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(1, 0));
             Assert.Equal("Cannot be lower than zero.\r\nParameter name: pageSize", ex.Message);
 
             ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(0));
             Assert.Equal("Cannot be lower than 1.\r\nParameter name: pageIndex", ex.Message);
+#else
+            ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(0, 1));
+            Assert.Equal("Cannot be lower than 1. (Parameter 'pageIndex')", ex.Message);
+
+            ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(1, 0));
+            Assert.Equal("Cannot be lower than zero. (Parameter 'pageSize')", ex.Message);
+
+            ex = Assert.Throws<ArgumentOutOfRangeException>(() => options.Page(0));
+            Assert.Equal("Cannot be lower than 1. (Parameter 'pageIndex')", ex.Message);
+#endif
 
             options = new QueryOptions<Customer>().Page(pageIndex);
 

test/DotNetToolkit.Repository.Test/appsettings.json

@@ -14,7 +14,7 @@
       }
     },
     "cachingProvider": {
-      "type": "DotNetToolkit.Repository.Caching.InMemory.InMemoryCacheProvider, DotNetToolkit.Repository.Caching.InMemory",
+      "type": "DotNetToolkit.Repository.Test.Data.TestCacheProvider, DotNetToolkit.Repository.Test",
       "parameters": {
         "expiry": "00:00:30"
       }

test/DotNetToolkit.Repository.Test/repository.config

@@ -12,7 +12,7 @@
     <loggingProvider type="DotNetToolkit.Repository.Configuration.Logging.ConsoleLoggerProvider, DotNetToolkit.Repository">
       <param name="minLogLevel" value="Debug" />
     </loggingProvider>
-    <cachingProvider type="DotNetToolkit.Repository.Caching.InMemory.InMemoryCacheProvider, DotNetToolkit.Repository.Caching.InMemory">
+    <cachingProvider type="DotNetToolkit.Repository.Test.Data.TestCacheProvider, DotNetToolkit.Repository.Test">
       <expiry value="00:00:30" />
     </cachingProvider>
     <interceptors>