reorg

CSharpExtender/CSharpExtender.csproj

@@ -20,12 +20,6 @@
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="DataAnnotations\**" />
-    <EmbeddedResource Remove="DataAnnotations\**" />
-    <None Remove="DataAnnotations\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\LICENSE.txt">
       <Pack>True</Pack>

CSharpExtender/Attributes/UniqueItemsAttribute.cs → CSharpExtender/DataAnnotations/UniqueItemsAttribute.cs

@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace CSharpExtender.Attributes;
+namespace CSharpExtender.DataAnnotations;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
 public class UniqueItemsAttribute : ValidationAttribute

Test.CSharpExtender/Attributes/Test_UniqueItemsAttribute.cs → Test.CSharpExtender/DataAnnotations/Test_UniqueItemsAttribute.cs

@@ -1,9 +1,9 @@
-using CSharpExtender.Attributes;
+using CSharpExtender.DataAnnotations;
 using System.ComponentModel.DataAnnotations;
 
-namespace Test.CSharpExtender.Attributes;
+namespace Test.CSharpExtender.DataAnnotations;
 
-public class UniqueItemsAttributeTests
+public class Test_UniqueItemsAttribute
 {
     private static ValidationContext GetValidationContext(object instance) => new(instance);
 
@@ -52,7 +52,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Contains("duplicate items", result.ErrorMessage);
         Assert.Contains("indices 0 and 1", result.ErrorMessage);
     }
 
@@ -64,7 +64,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Equal("All items must be unique in the list.", result.ErrorMessage);
     }
 
     [Fact]
@@ -85,7 +85,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Contains("duplicate items", result.ErrorMessage);
         Assert.Contains("indices 1 and 2", result.ErrorMessage);
     }
 
@@ -97,7 +97,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Equal("Numbers must be unique.", result.ErrorMessage);
     }
 
     [Fact]
@@ -134,7 +134,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Contains("duplicate items", result.ErrorMessage);
         Assert.Contains("indices 0 and 1", result.ErrorMessage);
     }
 
@@ -154,7 +154,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Equal("Objects in the list must have unique values.", result.ErrorMessage);
     }
 
     [Fact]
@@ -165,7 +165,7 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Contains("must be applied to a collection", result.ErrorMessage);
     }
 
     [Fact]
@@ -176,5 +176,5 @@
         var result = attribute.GetValidationResult(model.Items, GetValidationContext(model));
 
         Assert.NotEqual(ValidationResult.Success, result);
         Assert.Contains("must be applied to a collection", result.ErrorMessage);
     }