Feature/bit auto data (#2219)

* Update ProviderService tests

* Use BitAutoData in CipherService tests

* Simplify UserCipher fixture

Because we use a single customizer for all ciphers, they all have the same userId.

* Clean up more cipher fixtures

* Swap Cipher Fixtures to BitCustomizeAttribute

* Clean up collection fixtures

* Clean up GroupFixtures

* Move SendService Tests to BitAutoData

* Clean up Organization Fixtures

TODO: The customize attributes should not be customizing more than one class

* Name files after the class they contain

* Clear up usage of CustomAutoDataAttribute in tests

* Clean up usages of InlineCustomAutoData

* format

* Manually merge with file-scoped-namespace changes

test/Core.Test/AutoFixture/CipherFixtures.cs

@@ -33,36 +33,12 @@ internal class UserCipher : ICustomization
     }
 }
 
-internal class UserCipherAutoDataAttribute : CustomAutoDataAttribute
+internal class UserCipherCustomizeAttribute : BitCustomizeAttribute
 {
-    public UserCipherAutoDataAttribute(string userId = null) : base(new SutProviderCustomization(),
-        new UserCipher { UserId = userId == null ? (Guid?)null : new Guid(userId) })
-    { }
-}
-internal class InlineUserCipherAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineUserCipherAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(UserCipher) }, values)
-    { }
+    public override ICustomization GetCustomization() => new UserCipher();
 }
 
-internal class InlineKnownUserCipherAutoDataAttribute : InlineCustomAutoDataAttribute
+internal class OrganizationCipherCustomizeAttribute : BitCustomizeAttribute
 {
-    public InlineKnownUserCipherAutoDataAttribute(string userId, params object[] values) : base(new ICustomization[]
-        { new SutProviderCustomization(), new UserCipher { UserId = new Guid(userId) } }, values)
-    { }
-}
-
-internal class OrganizationCipherAutoDataAttribute : CustomAutoDataAttribute
-{
-    public OrganizationCipherAutoDataAttribute(string organizationId = null) : base(new SutProviderCustomization(),
-        new OrganizationCipher { OrganizationId = organizationId == null ? (Guid?)null : new Guid(organizationId) })
-    { }
-}
-
-internal class InlineOrganizationCipherAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineOrganizationCipherAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(OrganizationCipher) }, values)
-    { }
+    public override ICustomization GetCustomization() => new OrganizationCipher();
 }

test/Core.Test/AutoFixture/CollectionFixtures.cs

@@ -1,10 +0,0 @@
-using Bit.Core.Test.AutoFixture.OrganizationFixtures;
-using Bit.Test.Common.AutoFixture.Attributes;
-
-namespace Bit.Core.Test.AutoFixture.CollectionFixtures;
-
-internal class CollectionAutoDataAttribute : CustomAutoDataAttribute
-{
-    public CollectionAutoDataAttribute() : base(new SutProviderCustomization(), new OrganizationCustomization())
-    { }
-}

test/Core.Test/AutoFixture/CurrentContextFixtures.cs

@@ -2,6 +2,7 @@
 using AutoFixture.Kernel;
 using Bit.Core.Context;
 using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.Core.Test.AutoFixture.CurrentContextFixtures;
 
@@ -35,3 +36,8 @@ internal class CurrentContextBuilder : ISpecimenBuilder
         return obj;
     }
 }
+
+internal class CurrentContextCustomize : BitCustomizeAttribute
+{
+    public override ICustomization GetCustomization() => new CurrentContext();
+}

test/Core.Test/AutoFixture/GroupFixtures.cs

@@ -1,18 +0,0 @@
-using Bit.Core.Test.AutoFixture.OrganizationFixtures;
-using Bit.Test.Common.AutoFixture.Attributes;
-
-namespace Bit.Core.Test.AutoFixture.GroupFixtures;
-
-internal class GroupOrganizationAutoDataAttribute : CustomAutoDataAttribute
-{
-    public GroupOrganizationAutoDataAttribute() : base(
-        new SutProviderCustomization(), new OrganizationCustomization { UseGroups = true })
-    { }
-}
-
-internal class GroupOrganizationNotUseGroupsAutoDataAttribute : CustomAutoDataAttribute
-{
-    public GroupOrganizationNotUseGroupsAutoDataAttribute() : base(
-        new SutProviderCustomization(), new OrganizationCustomization { UseGroups = false })
-    { }
-}

test/Core.Test/AutoFixture/OrganizationFixtures.cs

@@ -64,7 +64,7 @@ internal class PaidOrganization : ICustomization
     public PlanType CheckedPlanType { get; set; }
     public void Customize(IFixture fixture)
     {
-        var validUpgradePlans = StaticStore.Plans.Where(p => p.Type != PlanType.Free && !p.Disabled).Select(p => p.Type).ToList();
+        var validUpgradePlans = StaticStore.Plans.Where(p => p.Type != PlanType.Free && p.LegacyYear == null).OrderBy(p => p.UpgradeSortOrder).Select(p => p.Type).ToList();
         var lowestActivePaidPlan = validUpgradePlans.First();
         CheckedPlanType = CheckedPlanType.Equals(PlanType.Free) ? lowestActivePaidPlan : CheckedPlanType;
         validUpgradePlans.Remove(lowestActivePaidPlan);
@@ -109,7 +109,7 @@ internal class OrganizationInvite : ICustomization
     public string PermissionsBlob { get; set; }
     public void Customize(IFixture fixture)
     {
-        var organizationId = new Guid();
+        var organizationId = Guid.NewGuid();
         PermissionsBlob = PermissionsBlob ?? JsonSerializer.Serialize(new Permissions(), new JsonSerializerOptions
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -126,60 +126,38 @@ internal class OrganizationInvite : ICustomization
     }
 }
 
-internal class PaidOrganizationAutoDataAttribute : CustomAutoDataAttribute
+internal class OrganizationCustomizeAttribute : BitCustomizeAttribute
 {
-    public PaidOrganizationAutoDataAttribute(PlanType planType) : base(new SutProviderCustomization(),
-        new PaidOrganization { CheckedPlanType = planType })
-    { }
-    public PaidOrganizationAutoDataAttribute(int planType = 0) : this((PlanType)planType) { }
+    public bool UseGroups { get; set; }
+    public override ICustomization GetCustomization() => new OrganizationCustomization() { UseGroups = UseGroups };
 }
 
-internal class InlinePaidOrganizationAutoDataAttribute : InlineCustomAutoDataAttribute
+internal class PaidOrganizationCustomizeAttribute : BitCustomizeAttribute
 {
-    public InlinePaidOrganizationAutoDataAttribute(PlanType planType, object[] values) : base(
-        new ICustomization[] { new SutProviderCustomization(), new PaidOrganization { CheckedPlanType = planType } }, values)
-    { }
-
-    public InlinePaidOrganizationAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(PaidOrganization) }, values)
-    { }
+    public PlanType CheckedPlanType { get; set; } = PlanType.FamiliesAnnually;
+    public override ICustomization GetCustomization() => new PaidOrganization() { CheckedPlanType = CheckedPlanType };
 }
 
-internal class InlineFreeOrganizationAutoDataAttribute : InlineCustomAutoDataAttribute
+internal class FreeOrganizationCustomizeAttribute : BitCustomizeAttribute
 {
-    public InlineFreeOrganizationAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(FreeOrganization) }, values)
-    { }
+    public override ICustomization GetCustomization() => new FreeOrganization();
 }
 
-internal class FreeOrganizationUpgradeAutoDataAttribute : CustomAutoDataAttribute
+internal class FreeOrganizationUpgradeCustomize : BitCustomizeAttribute
 {
-    public FreeOrganizationUpgradeAutoDataAttribute() : base(new SutProviderCustomization(), new FreeOrganizationUpgrade())
-    { }
+    public override ICustomization GetCustomization() => new FreeOrganizationUpgrade();
 }
 
-internal class InlineFreeOrganizationUpgradeAutoDataAttribute : InlineCustomAutoDataAttribute
+internal class OrganizationInviteCustomizeAttribute : BitCustomizeAttribute
 {
-    public InlineFreeOrganizationUpgradeAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(FreeOrganizationUpgrade) }, values)
-    { }
-}
+    public OrganizationUserType InviteeUserType { get; set; } = OrganizationUserType.Owner;
+    public OrganizationUserType InvitorUserType { get; set; } = OrganizationUserType.Owner;
+    public string PermissionsBlob { get; set; }
 
-internal class OrganizationInviteAutoDataAttribute : CustomAutoDataAttribute
-{
-    public OrganizationInviteAutoDataAttribute(int inviteeUserType = 0, int invitorUserType = 0, string permissionsBlob = null) : base(new SutProviderCustomization(),
-        new OrganizationInvite
-        {
-            InviteeUserType = (OrganizationUserType)inviteeUserType,
-            InvitorUserType = (OrganizationUserType)invitorUserType,
-            PermissionsBlob = permissionsBlob,
-        })
-    { }
-}
-
-internal class InlineOrganizationInviteAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineOrganizationInviteAutoDataAttribute(params object[] values) : base(new[] { typeof(SutProviderCustomization),
-        typeof(OrganizationInvite) }, values)
-    { }
+    public override ICustomization GetCustomization() => new OrganizationInvite
+    {
+        InviteeUserType = InviteeUserType,
+        InvitorUserType = InvitorUserType,
+        PermissionsBlob = PermissionsBlob,
+    };
 }

test/Core.Test/AutoFixture/SendFixtures.cs

@@ -4,17 +4,6 @@ using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.Core.Test.AutoFixture.SendFixtures;
 
-internal class OrganizationSend : ICustomization
-{
-    public Guid? OrganizationId { get; set; }
-    public void Customize(IFixture fixture)
-    {
-        fixture.Customize<Send>(composer => composer
-            .With(s => s.OrganizationId, OrganizationId ?? Guid.NewGuid())
-            .Without(s => s.UserId));
-    }
-}
-
 internal class UserSend : ICustomization
 {
     public Guid? UserId { get; set; }
@@ -26,38 +15,7 @@ internal class UserSend : ICustomization
     }
 }
 
-internal class UserSendAutoDataAttribute : CustomAutoDataAttribute
+internal class UserSendCustomizeAttribute : BitCustomizeAttribute
 {
-    public UserSendAutoDataAttribute(string userId = null) : base(new SutProviderCustomization(),
-        new UserSend { UserId = userId == null ? (Guid?)null : new Guid(userId) })
-    { }
-}
-internal class InlineUserSendAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineUserSendAutoDataAttribute(params object[] values) : base(new[] { typeof(CurrentContextFixtures.CurrentContext),
-        typeof(SutProviderCustomization), typeof(UserSend) }, values)
-    { }
-}
-
-internal class InlineKnownUserSendAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineKnownUserSendAutoDataAttribute(string userId, params object[] values) : base(new ICustomization[]
-        { new CurrentContextFixtures.CurrentContext(), new SutProviderCustomization(),
-        new UserSend { UserId = new Guid(userId) } }, values)
-    { }
-}
-
-internal class OrganizationSendAutoDataAttribute : CustomAutoDataAttribute
-{
-    public OrganizationSendAutoDataAttribute(string organizationId = null) : base(new CurrentContextFixtures.CurrentContext(),
-        new SutProviderCustomization(),
-        new OrganizationSend { OrganizationId = organizationId == null ? (Guid?)null : new Guid(organizationId) })
-    { }
-}
-
-internal class InlineOrganizationSendAutoDataAttribute : InlineCustomAutoDataAttribute
-{
-    public InlineOrganizationSendAutoDataAttribute(params object[] values) : base(new[] { typeof(CurrentContextFixtures.CurrentContext),
-        typeof(SutProviderCustomization), typeof(OrganizationSend) }, values)
-    { }
+    public override ICustomization GetCustomization() => new UserSend();
 }

test/Core.Test/AutoFixture/UserFixtures.cs

@@ -5,6 +5,7 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Test.AutoFixture.OrganizationFixtures;
 using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.Core.Test.AutoFixture.UserFixtures;
 
@@ -42,6 +43,11 @@ public class UserBuilder : ISpecimenBuilder
     }
 }
 
+internal class UserCustomizeAttribute : BitCustomizeAttribute
+{
+    public override ICustomization GetCustomization() => new UserFixture();
+}
+
 public class UserFixture : ICustomization
 {
     public virtual void Customize(IFixture fixture)