From a4df079e3a594fe8d5b591bccf9126c0970ab979 Mon Sep 17 00:00:00 2001 From: Kamil Szymanski Date: Thu, 2 Apr 2015 17:57:58 +0200 Subject: [PATCH] changes after code review --- .../ofg/uptodate/reporting/NewVersionLogger.groovy | 13 ++++++++----- .../uptodate/reporting/NewVersionLoggerSpec.groovy | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/groovy/com/ofg/uptodate/reporting/NewVersionLogger.groovy b/src/main/groovy/com/ofg/uptodate/reporting/NewVersionLogger.groovy index 0ceedda..fb44675 100644 --- a/src/main/groovy/com/ofg/uptodate/reporting/NewVersionLogger.groovy +++ b/src/main/groovy/com/ofg/uptodate/reporting/NewVersionLogger.groovy @@ -8,14 +8,13 @@ import groovy.util.logging.Slf4j @Slf4j class NewVersionLogger { + private static final boolean DO_NOT_MUTATE_ORIGINAL_COLLECTION = false private static final String NEW_VERSIONS_AVAILABLE = 'New versions available' private static final String NO_NEW_VERSIONS_AVAILABLE = 'No new versions available' public static final String NEW_VERSIONS_MESSAGE_HEADER = "${NEW_VERSIONS_AVAILABLE}:\n" public static final String NO_NEW_VERSIONS_MESSAGE = "${NO_NEW_VERSIONS_AVAILABLE}." - private static final boolean DO_NOT_MUTATE_ORIGINAL_COLLECTION = false - private final LoggerProxy logger private final String projectName private final boolean reportProjectName @@ -31,15 +30,19 @@ class NewVersionLogger { logger.lifecycle(log, noNewVersionsMessage()) } else { List sortedUpdates = newVersions.sort(DO_NOT_MUTATE_ORIGINAL_COLLECTION, new DependencyGroupAndNameComparator()) - logger.lifecycle(log, "${newVersionsMessageHeader()}${sortedUpdates.join('\n')}") + logger.lifecycle(log, newVersionsReport(sortedUpdates)) } } - private String noNewVersionsMessage() { - return reportProjectName ? "$NO_NEW_VERSIONS_AVAILABLE for $projectName." : NO_NEW_VERSIONS_MESSAGE + private String newVersionsReport(newVersions) { + return "${newVersionsMessageHeader()}${newVersions.join('\n')}" } private String newVersionsMessageHeader() { return reportProjectName ? "$NEW_VERSIONS_AVAILABLE for $projectName:\n" : NEW_VERSIONS_MESSAGE_HEADER } + + private String noNewVersionsMessage() { + return reportProjectName ? "$NO_NEW_VERSIONS_AVAILABLE for $projectName." : NO_NEW_VERSIONS_MESSAGE + } } diff --git a/src/test/groovy/com/ofg/uptodate/reporting/NewVersionLoggerSpec.groovy b/src/test/groovy/com/ofg/uptodate/reporting/NewVersionLoggerSpec.groovy index 3c27b88..e35c807 100644 --- a/src/test/groovy/com/ofg/uptodate/reporting/NewVersionLoggerSpec.groovy +++ b/src/test/groovy/com/ofg/uptodate/reporting/NewVersionLoggerSpec.groovy @@ -24,7 +24,9 @@ class NewVersionLoggerSpec extends Specification { when: reporter.reportUpdates(updates as Set) then: - 1 * logger.lifecycle(_, "$NEW_VERSIONS_MESSAGE_HEADER$JUNIT\n$HIBERNATE") + 1 * logger.lifecycle(_, NEW_VERSIONS_MESSAGE_HEADER + + "'junit:junit:4.11'\n" + + "'org.hibernate:hibernate-core:4.3.6.Final'") } def 'should not print project name by default'() { @@ -36,7 +38,7 @@ class NewVersionLoggerSpec extends Specification { 1 * logger.lifecycle(_, message) where: dependencies | message - [JUNIT] | "$NEW_VERSIONS_MESSAGE_HEADER$JUNIT" + [JUNIT] | "$NEW_VERSIONS_MESSAGE_HEADER'junit:junit:4.11'" [] | NO_NEW_VERSIONS_MESSAGE } @@ -49,7 +51,7 @@ class NewVersionLoggerSpec extends Specification { 1 * logger.lifecycle(_, message) where: dependencies | message - [JUNIT] | "$NEW_VERSIONS_AVAILABLE for $PROJECT_NAME:\n$JUNIT" + [JUNIT] | "$NEW_VERSIONS_AVAILABLE for $PROJECT_NAME:\n'junit:junit:4.11'" [] | "$NO_NEW_VERSIONS_AVAILABLE for $PROJECT_NAME." } }