From d01aa198c9a892315924452687a423441051f0fd Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 24 Oct 2012 15:38:00 +0200 Subject: [PATCH] Fix method name --- .../sonar/runner/internal/batch/SonarProjectBuilder.java | 6 +++--- .../runner/internal/batch/SonarProjectBuilderTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java index 324bd15..5e2cb81 100644 --- a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java +++ b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java @@ -167,8 +167,8 @@ public final class SonarProjectBuilder { for (String module : SonarRunnerUtils.getListFromProperty(parentProps, PROPERTY_MODULES)) { Properties moduleProps = extractModuleProperties(module, parentProps); ProjectDefinition childProject = loadChildProject(parentProject, moduleProps, module); - // check the unicity of the child key - checkUnicityOfChildKey(childProject, parentProject); + // check the uniqueness of the child key + checkUniquenessOfChildKey(childProject, parentProject); // the child project may have children as well defineChildren(childProject); // and finally add this child project to its parent @@ -260,7 +260,7 @@ public final class SonarProjectBuilder { } @VisibleForTesting - protected static void checkUnicityOfChildKey(ProjectDefinition childProject, ProjectDefinition parentProject) { + protected static void checkUniquenessOfChildKey(ProjectDefinition childProject, ProjectDefinition parentProject) { for (ProjectDefinition definition : parentProject.getSubProjects()) { if (definition.getKey().equals(childProject.getKey())) { throw new RunnerException("Project '" + parentProject.getKey() + "' can't have 2 modules with the following key: " + childProject.getKey()); diff --git a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java b/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java index c83889e..3c51885 100644 --- a/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java +++ b/src/test/java/org/sonar/runner/internal/batch/SonarProjectBuilderTest.java @@ -417,11 +417,11 @@ public class SonarProjectBuilderTest { props1.put("sonar.projectKey", "mod1"); root.addSubProject(ProjectDefinition.create(props1)); - // Check unicity of a new module: OK + // Check uniqueness of a new module: OK Properties props2 = new Properties(); props2.put("sonar.projectKey", "mod2"); ProjectDefinition mod2 = ProjectDefinition.create(props2); - SonarProjectBuilder.checkUnicityOfChildKey(mod2, root); + SonarProjectBuilder.checkUniquenessOfChildKey(mod2, root); // Now, add it and check again root.addSubProject(mod2); @@ -429,7 +429,7 @@ public class SonarProjectBuilderTest { thrown.expect(RunnerException.class); thrown.expectMessage("Project 'root' can't have 2 modules with the following key: mod2"); - SonarProjectBuilder.checkUnicityOfChildKey(mod2, root); + SonarProjectBuilder.checkUniquenessOfChildKey(mod2, root); } @Test -- 2.39.5