Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelectorTests.java

@@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Tests for {@link ManagementContextConfigurationsImportSelector}.
  *
  * @author Phillip Webb
+ * @author Andy Wilkinson
  */
 public class ManagementContextConfigurationsImportSelectorTests {
 
@@ -37,7 +38,7 @@ public class ManagementContextConfigurationsImportSelectorTests {
 		String[] imports = new TestManagementContextConfigurationsImportSelector()
 				.selectImports(null);
 		assertThat(imports).containsExactly(A.class.getName(), B.class.getName(),
-				C.class.getName());
+				C.class.getName(), D.class.getName());
 	}
 
 	private static class TestManagementContextConfigurationsImportSelector
@@ -45,7 +46,8 @@ public class ManagementContextConfigurationsImportSelectorTests {
 
 		@Override
 		protected List<String> loadFactoryNames() {
-			return Arrays.asList(C.class.getName(), A.class.getName(), B.class.getName());
+			return Arrays.asList(C.class.getName(), A.class.getName(), D.class.getName(),
+					B.class.getName());
 		}
 
 	}
@@ -65,4 +67,8 @@ public class ManagementContextConfigurationsImportSelectorTests {
 
 	}
 
+	static class D {
+
+	}
+
 }