diff --git a/DOL.WHD.Section14c.Business/Validators/SourceEmployerValidator.cs b/DOL.WHD.Section14c.Business/Validators/SourceEmployerValidator.cs index f5bd79df..c0c98138 100644 --- a/DOL.WHD.Section14c.Business/Validators/SourceEmployerValidator.cs +++ b/DOL.WHD.Section14c.Business/Validators/SourceEmployerValidator.cs @@ -5,10 +5,10 @@ namespace DOL.WHD.Section14c.Business.Validators { public class SourceEmployerValidator : BaseValidator, ISourceEmployerValidator { - public SourceEmployerValidator(IAddressValidator addressValidator) + public SourceEmployerValidator(IAddressValidatorNoCounty addressValidatorNoCounty) { RuleFor(s => s.EmployerName).NotEmpty(); - RuleFor(s => s.Address).NotNull().SetValidator(addressValidator); + RuleFor(s => s.Address).NotNull().SetValidator(addressValidatorNoCounty); RuleFor(s => s.Phone).NotEmpty(); RuleFor(s => s.ContactName).NotEmpty(); RuleFor(s => s.ContactTitle).NotEmpty(); diff --git a/DOL.WHD.Section14c.Test/Business/Validators/ApplicationSubmissionValidatorTests.cs b/DOL.WHD.Section14c.Test/Business/Validators/ApplicationSubmissionValidatorTests.cs index 6a0f55fd..55a21d61 100644 --- a/DOL.WHD.Section14c.Test/Business/Validators/ApplicationSubmissionValidatorTests.cs +++ b/DOL.WHD.Section14c.Test/Business/Validators/ApplicationSubmissionValidatorTests.cs @@ -15,7 +15,7 @@ public class ApplicationSubmissionValidatorTests private static readonly IAddressValidator AddressValidator = new AddressValidator(); private static readonly IWorkerCountInfoValidator WorkerCountInfoValidator = new WorkerCountInfoValidator(); private static readonly IEmployerValidator EmployerValidator = new EmployerValidator(AddressValidator, WorkerCountInfoValidator); - private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidator); + private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidatorNoCounty); private static readonly IPrevailingWageSurveyInfoValidator PrevailingWageSurveyInfoValidator = new PrevailingWageSurveyInfoValidator(SourceEmployerValidator); private static readonly IAlternateWageDataValidator AlternateWageDataValidator = new AlternateWageDataValidator(); private static readonly IHourlyWageInfoValidator HourlyWageInfoValidator = new HourlyWageInfoValidator(PrevailingWageSurveyInfoValidator, AlternateWageDataValidator); diff --git a/DOL.WHD.Section14c.Test/Business/Validators/HourlyWageInfoValidatorTests.cs b/DOL.WHD.Section14c.Test/Business/Validators/HourlyWageInfoValidatorTests.cs index 77e6bb96..09504968 100644 --- a/DOL.WHD.Section14c.Test/Business/Validators/HourlyWageInfoValidatorTests.cs +++ b/DOL.WHD.Section14c.Test/Business/Validators/HourlyWageInfoValidatorTests.cs @@ -10,8 +10,8 @@ namespace DOL.WHD.Section14c.Test.Business.Validators [TestClass] public class HourlyWageInfoValidatorTests { - private static readonly IAddressValidator AddressValidator = new AddressValidator(); - private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidator); + private static readonly IAddressValidatorNoCounty AddressValidatorNoCounty = new AddressValidatorNoCounty(); + private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidatorNoCounty); private static readonly IPrevailingWageSurveyInfoValidator PrevailingWageSurveyInfoValidator = new PrevailingWageSurveyInfoValidator(SourceEmployerValidator); private static readonly IAlternateWageDataValidator AlternateWageDataValidator = new AlternateWageDataValidator(); private static readonly IHourlyWageInfoValidator HourlyWageInfoValidator = new HourlyWageInfoValidator(PrevailingWageSurveyInfoValidator, AlternateWageDataValidator); diff --git a/DOL.WHD.Section14c.Test/Business/Validators/PieceRateWageInfoValidatorTests.cs b/DOL.WHD.Section14c.Test/Business/Validators/PieceRateWageInfoValidatorTests.cs index 4573080b..1981e798 100644 --- a/DOL.WHD.Section14c.Test/Business/Validators/PieceRateWageInfoValidatorTests.cs +++ b/DOL.WHD.Section14c.Test/Business/Validators/PieceRateWageInfoValidatorTests.cs @@ -10,8 +10,8 @@ namespace DOL.WHD.Section14c.Test.Business.Validators [TestClass] public class PieceRateWageInfoValidatorTests { - private static readonly IAddressValidator AddressValidator = new AddressValidator(); - private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidator); + private static readonly IAddressValidatorNoCounty AddressValidatorNoCounty = new AddressValidatorNoCounty(); + private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidatorNoCounty); private static readonly IPrevailingWageSurveyInfoValidator PrevailingWageSurveyInfoValidator = new PrevailingWageSurveyInfoValidator(SourceEmployerValidator); private static readonly IAlternateWageDataValidator AlternateWageDataValidator = new AlternateWageDataValidator(); private static readonly IPieceRateWageInfoValidator PieceRateWageInfoValidator = new PieceRateWageInfoValidator(PrevailingWageSurveyInfoValidator, AlternateWageDataValidator); diff --git a/DOL.WHD.Section14c.Test/Business/Validators/PrevailingWageSurveyInfoValidatorTests.cs b/DOL.WHD.Section14c.Test/Business/Validators/PrevailingWageSurveyInfoValidatorTests.cs index 9e8aea5c..4cc8e712 100644 --- a/DOL.WHD.Section14c.Test/Business/Validators/PrevailingWageSurveyInfoValidatorTests.cs +++ b/DOL.WHD.Section14c.Test/Business/Validators/PrevailingWageSurveyInfoValidatorTests.cs @@ -9,8 +9,8 @@ namespace DOL.WHD.Section14c.Test.Business.Validators [TestClass] public class PrevailingWageSurveyInfoValidatorTests { - private static readonly IAddressValidator AddressValidator = new AddressValidator(); - private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidator); + private static readonly IAddressValidatorNoCounty AddressValidatorNoCounty = new AddressValidatorNoCounty(); + private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidatorNoCounty); private static readonly IPrevailingWageSurveyInfoValidator PrevailingWageSurveyInfoValidator = new PrevailingWageSurveyInfoValidator(SourceEmployerValidator); [TestMethod] diff --git a/DOL.WHD.Section14c.Test/Business/Validators/SourceEmployerValidatorTests.cs b/DOL.WHD.Section14c.Test/Business/Validators/SourceEmployerValidatorTests.cs index c156b56e..6cfe0e54 100644 --- a/DOL.WHD.Section14c.Test/Business/Validators/SourceEmployerValidatorTests.cs +++ b/DOL.WHD.Section14c.Test/Business/Validators/SourceEmployerValidatorTests.cs @@ -9,8 +9,8 @@ namespace DOL.WHD.Section14c.Test.Business.Validators [TestClass] public class SourceEmployerValidatorTests { - private static readonly IAddressValidator AddressValidator = new AddressValidator(); - private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidator); + private static readonly IAddressValidatorNoCounty AddressValidatorNoCounty = new AddressValidatorNoCounty(); + private static readonly ISourceEmployerValidator SourceEmployerValidator = new SourceEmployerValidator(AddressValidatorNoCounty); [TestMethod] public void Should_Require_EmployerName()