0.1.17

* Update tests.yaml

* Protected skip validation

* Rename tests

* Refactor tests, add more attribute tests

* Add more null tests

* Add IncludeProperties, IncludeRuleSets, IncludeAllRuleSets, IncludeRulesNotInRuleSet tests

* Add last null input tests

* Bump package version

Author: sergeyshaykhullin

.github/workflows/tests.yaml

@@ -22,10 +22,10 @@ jobs:
         dotnet-version: 5.0.x
 
     - name: Tests
-      run: dotnet test /p:CollectCoverage=true /p:CoverletOutput=coverage/ /p:CoverletOutputFormat=lcov
+      run: dotnet test /p:CollectCoverage=true /p:CoverletOutput=../../ /p:CoverletOutputFormat=lcov
 
     - name: Tests | Coverage
       uses: codecov/codecov-action@v1
       with:
         flags: unittests
-        files: tests/AppAny.HotChocolate.FluentValidation.Tests/coverage/coverage.info
+        files: coverage.info

src/AppAny.HotChocolate.FluentValidation.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<Version>0.1.16</Version>
+		<Version>0.1.17</Version>
 		<LangVersion>9</LangVersion>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>

src/Attributes/SkipValidationAttribute.cs

@@ -9,7 +9,7 @@ public sealed override void Configure(ArgumentValidationBuilder builder)
 			builder.SkipValidation(SkipValidation);
 		}
 
-		public virtual ValueTask<bool> SkipValidation(SkipValidationContext skipValidationContext)
+		protected virtual ValueTask<bool> SkipValidation(SkipValidationContext skipValidationContext)
 		{
 			return ValidationDefaults.SkipValidation.Skip(skipValidationContext);
 		}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestCustomSkipValidationMutation.cs

@@ -7,7 +7,7 @@ public class CustomSkipValidationAttribute : SkipValidationAttribute
 	{
 		public const string SkipName = "Custom";
 
-		public override ValueTask<bool> SkipValidation(SkipValidationContext skipValidationContext)
+		protected override ValueTask<bool> SkipValidation(SkipValidationContext skipValidationContext)
 		{
 			var argumentValue = skipValidationContext
 				.MiddlewareContext

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseDefaultErrorMapperMutation.cs

@@ -10,7 +10,9 @@ protected override void Configure(IObjectTypeDescriptor descriptor)
 				field => field.Test(default!)).Type<StringType>();
 		}
 
-		public string Test([UseFluentValidation, UseDefaultErrorMapper] TestPersonInput input)
+		public string Test(
+			[UseFluentValidation, UseDefaultErrorMapper]
+			TestPersonInput input)
 		{
 			return "test";
 		}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseValidatorWithIncludeAllRuleSetsMutation.cs

@@ -0,0 +1,20 @@
+using HotChocolate.Types;
+
+namespace AppAny.HotChocolate.FluentValidation.Tests
+{
+	public class TestUseValidatorWithIncludeAllRuleSetsMutation : ObjectType
+	{
+		protected override void Configure(IObjectTypeDescriptor descriptor)
+		{
+			descriptor.Field<TestUseValidatorWithIncludeAllRuleSetsMutation>(
+				field => field.Test(default!)).Type<StringType>();
+		}
+
+		public string Test(
+			[UseFluentValidation, UseValidator(typeof(NotEmptyNameValidator), IncludeAllRuleSets = true)]
+			TestPersonInput input)
+		{
+			return "test";
+		}
+	}
+}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseValidatorWithIncludeRuleSetsMutation.cs

@@ -0,0 +1,20 @@
+using HotChocolate.Types;
+
+namespace AppAny.HotChocolate.FluentValidation.Tests
+{
+	public class TestUseValidatorWithIncludeRuleSetsMutation : ObjectType
+	{
+		protected override void Configure(IObjectTypeDescriptor descriptor)
+		{
+			descriptor.Field<TestUseValidatorWithIncludeRuleSetsMutation>(
+				field => field.Test(default!)).Type<StringType>();
+		}
+
+		public string Test(
+			[UseFluentValidation, UseValidator(typeof(NotEmptyNameValidator), IncludeRuleSets = new[]{"RuleSet"})]
+			TestPersonInput input)
+		{
+			return "test";
+		}
+	}
+}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseValidatorWithIncludeRulesNotInRuleSetMutation.cs

@@ -0,0 +1,20 @@
+using HotChocolate.Types;
+
+namespace AppAny.HotChocolate.FluentValidation.Tests
+{
+	public class TestUseValidatorWithIncludeRulesNotInRuleSetMutation : ObjectType
+	{
+		protected override void Configure(IObjectTypeDescriptor descriptor)
+		{
+			descriptor.Field<TestUseValidatorWithIncludeRulesNotInRuleSetMutation>(
+				field => field.Test(default!)).Type<StringType>();
+		}
+
+		public string Test(
+			[UseFluentValidation, UseValidator(typeof(NotEmptyNameValidator), IncludeRulesNotInRuleSet = true)]
+			TestPersonInput input)
+		{
+			return "test";
+		}
+	}
+}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseValidatorWithValidationStrategyAddressMutation.cs

@@ -0,0 +1,20 @@
+using HotChocolate.Types;
+
+namespace AppAny.HotChocolate.FluentValidation.Tests
+{
+	public class TestUseValidatorWithValidationStrategyAddressMutation : ObjectType
+	{
+		protected override void Configure(IObjectTypeDescriptor descriptor)
+		{
+			descriptor.Field<TestUseValidatorWithValidationStrategyAddressMutation>(
+				field => field.Test(default!)).Type<StringType>();
+		}
+
+		public string Test(
+			[UseFluentValidation, UseValidator(typeof(NotEmptyNameValidator), IncludeProperties = new[] { "Address" })]
+			TestPersonInput input)
+		{
+			return "test";
+		}
+	}
+}

tests/AppAny.HotChocolate.FluentValidation.Tests/Core/Mutations/Attribute/TestUseValidatorWithValidationStrategyMutation.cs

@@ -0,0 +1,20 @@
+using HotChocolate.Types;
+
+namespace AppAny.HotChocolate.FluentValidation.Tests
+{
+	public class TestUseValidatorWithValidationStrategyMutation : ObjectType
+	{
+		protected override void Configure(IObjectTypeDescriptor descriptor)
+		{
+			descriptor.Field<TestUseValidatorWithValidationStrategyMutation>(
+				field => field.Test(default!)).Type<StringType>();
+		}
+
+		public string Test(
+			[UseFluentValidation, UseValidator(typeof(NotEmptyNameValidator), IncludeProperties = new[] { "Name" })]
+			TestPersonInput input)
+		{
+			return "test";
+		}
+	}
+}