pull/2150/merge
Stephane Nicoll 10 years ago
parent 5efdb85876
commit e8e39e4bcf

@ -388,7 +388,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
} }
@Test @Test
public void incremenalBuildAnnotationRemoved() throws Exception { public void incrementalBuildAnnotationRemoved() throws Exception {
TestProject project = new TestProject(this.temporaryFolder, FooProperties.class, TestProject project = new TestProject(this.temporaryFolder, FooProperties.class,
BarProperties.class); BarProperties.class);
ConfigurationMetadata metadata = project.fullBuild(); ConfigurationMetadata metadata = project.fullBuild();
@ -403,7 +403,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
} }
@Test @Test
public void incremenalBuildTypeRenamed() throws Exception { public void incrementalBuildTypeRenamed() throws Exception {
TestProject project = new TestProject(this.temporaryFolder, FooProperties.class, TestProject project = new TestProject(this.temporaryFolder, FooProperties.class,
BarProperties.class); BarProperties.class);
ConfigurationMetadata metadata = project.fullBuild(); ConfigurationMetadata metadata = project.fullBuild();

@ -39,7 +39,7 @@ public class ConfigurationMetadataMatchers {
} }
public static ContainsItemMatcher containsGroup(String name, String type) { public static ContainsItemMatcher containsGroup(String name, String type) {
return new ContainsItemMatcher(ItemType.GROUP, name).ofDataType(type); return new ContainsItemMatcher(ItemType.GROUP, name).ofType(type);
} }
public static ContainsItemMatcher containsProperty(String name) { public static ContainsItemMatcher containsProperty(String name) {
@ -51,7 +51,7 @@ public class ConfigurationMetadataMatchers {
} }
public static ContainsItemMatcher containsProperty(String name, String type) { public static ContainsItemMatcher containsProperty(String name, String type) {
return new ContainsItemMatcher(ItemType.PROPERTY, name).ofDataType(type); return new ContainsItemMatcher(ItemType.PROPERTY, name).ofType(type);
} }
public static class ContainsItemMatcher extends BaseMatcher<ConfigurationMetadata> { public static class ContainsItemMatcher extends BaseMatcher<ConfigurationMetadata> {
@ -154,7 +154,7 @@ public class ConfigurationMetadataMatchers {
this.sourceType, this.description, this.defaultValue, this.deprecated); this.sourceType, this.description, this.defaultValue, this.deprecated);
} }
public ContainsItemMatcher ofDataType(String dataType) { public ContainsItemMatcher ofType(String dataType) {
return new ContainsItemMatcher(this.itemType, this.name, dataType, return new ContainsItemMatcher(this.itemType, this.name, dataType,
this.sourceType, this.description, this.defaultValue, this.deprecated); this.sourceType, this.description, this.defaultValue, this.deprecated);
} }

Loading…
Cancel
Save