diff --git a/test/Spring/Spring.Core.Configuration.Tests/Objects/Factory/Support/AssemblyScanningExtensionMethodsTests.cs b/test/Spring/Spring.Core.Configuration.Tests/Objects/Factory/Support/AssemblyScanningExtensionMethodsTests.cs index 89810733..94e24397 100644 --- a/test/Spring/Spring.Core.Configuration.Tests/Objects/Factory/Support/AssemblyScanningExtensionMethodsTests.cs +++ b/test/Spring/Spring.Core.Configuration.Tests/Objects/Factory/Support/AssemblyScanningExtensionMethodsTests.cs @@ -14,17 +14,17 @@ namespace Spring.Objects.Factory.Support public class AssemblyScanningExtensionMethodsTests { [Test] - public void Integration_Scenario_With_Defaults() + public void Integration_Scenario_With_Assembly_Filename_And_Assembly_Metadata_Filtering() { GenericApplicationContext context = new GenericApplicationContext(); - context.ScanAssembliesAndRegisterDefinitions();// (assy => assy.GetTypes().Any(type => type.FullName.Contains("SomeType"))); + context.ScanAssembliesAndRegisterDefinitions(fn => fn.StartsWith("Spring."), assy => assy.GetTypes().Any(type => type.FullName.Contains(typeof(MarkerTypeForScannerToFind).Name))); context.Refresh(); AssertExpectedObjectsAreRegisteredWith(context); } [Test] - public void Integration_Scenario_With_Filtering_Example() + public void Integration_Scenario_With_Assembly_Metadata_Filtering() { GenericApplicationContext context = new GenericApplicationContext(); context.ScanAssembliesAndRegisterDefinitions(assy => assy.GetTypes().Any(type => type.FullName.Contains(typeof(MarkerTypeForScannerToFind).Name))); @@ -33,22 +33,23 @@ namespace Spring.Objects.Factory.Support AssertExpectedObjectsAreRegisteredWith(context); } + [Test] + public void Integration_Scenario_With_Default_of_No_Filtering() + { + GenericApplicationContext context = new GenericApplicationContext(); + context.ScanAssembliesAndRegisterDefinitions(); + context.Refresh(); + + AssertExpectedObjectsAreRegisteredWith(context); + } + private static void AssertExpectedObjectsAreRegisteredWith(GenericApplicationContext context) { Assert.That(context.DefaultListableObjectFactory.ObjectDefinitionCount, Is.EqualTo(13)); } - [Test] - public void Integration_Scenario_With_Complex_Filtering_Example() - { - GenericApplicationContext context = new GenericApplicationContext(); - context.ScanAssembliesAndRegisterDefinitions(fn => fn.StartsWith("Spring."), assy => assy.GetTypes().Any(type => type.FullName.Contains(typeof(MarkerTypeForScannerToFind).Name))); - context.Refresh(); - AssertExpectedObjectsAreRegisteredWith(context); - } } - public class MarkerTypeForScannerToFind {