You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/12/16 10:17:56 UTC
[sling-org-apache-sling-committer-cli] branch master updated: tests
minor code cleanup
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-committer-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 1569b7c tests minor code cleanup
1569b7c is described below
commit 1569b7cbd32e6f65bbfb0c1e7beeca8906038646
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Dec 16 11:09:35 2019 +0100
tests minor code cleanup
---
.../apache/sling/cli/impl/jira/VersionClient.java | 1 +
.../cli/impl/jbake/JBakeContentUpdaterTest.java | 20 +++++++++++---------
.../sling/cli/impl/jira/CreateVersionJiraAction.java | 8 +++++---
.../sling/cli/impl/jira/VersionClientTest.java | 2 +-
.../sling/cli/impl/junit/SystemPropertiesRule.java | 6 +++---
.../cli/impl/pgp/PGPSignatureValidatorTest.java | 11 +++++------
.../cli/impl/release/UpdateReporterCommandTest.java | 4 +---
7 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java b/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
index 0980375..0621199 100644
--- a/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
+++ b/src/main/java/org/apache/sling/cli/impl/jira/VersionClient.java
@@ -303,6 +303,7 @@ public class VersionClient {
return issuesFixedCount;
}
+ @SuppressWarnings("unused")
public void setIssuesFixedCount(int issuesFixedCount) {
this.issuesFixedCount = issuesFixedCount;
}
diff --git a/src/test/java/org/apache/sling/cli/impl/jbake/JBakeContentUpdaterTest.java b/src/test/java/org/apache/sling/cli/impl/jbake/JBakeContentUpdaterTest.java
index 5bbbc53..27aa1fb 100644
--- a/src/test/java/org/apache/sling/cli/impl/jbake/JBakeContentUpdaterTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/jbake/JBakeContentUpdaterTest.java
@@ -20,6 +20,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
import org.eclipse.jgit.api.Git;
@@ -72,11 +74,11 @@ public class JBakeContentUpdaterTest {
int changeCount = updater.updateDownloads(templatePath, newReleaseName, newReleaseVersion);
assertThat("Unexpected count of changes", changeCount, equalTo(1));
- String apiLine = Files.readAllLines(templatePath, StandardCharsets.UTF_8).stream()
+ Optional<String> apiLineHolder = Files.readAllLines(templatePath, StandardCharsets.UTF_8).stream()
.filter( l -> l.trim().startsWith("\"" + newReleaseName + "|"))
- .findFirst()
- .get();
-
+ .findFirst();
+ assertTrue(apiLineHolder.isPresent());
+ String apiLine = apiLineHolder.get();
assertThat("Did not find modified version in the release line", apiLine, containsString(newReleaseVersion));
}
@@ -94,7 +96,7 @@ public class JBakeContentUpdaterTest {
@Test
public void updateReleases_releaseInExistingMonth() throws IOException, GitAPIException {
- updateReleases0(LocalDateTime.of(2019, 2, 27, 22, 00),
+ updateReleases0(LocalDateTime.of(2019, 2, 27, 22, 0),
Arrays.asList(
" " ,
" ## February 2019",
@@ -149,7 +151,7 @@ public class JBakeContentUpdaterTest {
List<String> ignoredPrefixes = Arrays.asList("diff", "index", "---", "+++", "@@");
List<String> diffLines = Arrays.stream(new String(out.toByteArray(), StandardCharsets.UTF_8)
.split("\\n"))
- .filter( l -> !ignoredPrefixes.stream().filter( p -> l.startsWith(p)).findAny().isPresent() )
+ .filter( l -> ignoredPrefixes.stream().noneMatch(l::startsWith))
.collect(Collectors.toList());
assertThat(diffLines, contains(expectedLines.toArray(new String[0])));
@@ -158,12 +160,12 @@ public class JBakeContentUpdaterTest {
@Test
public void updateReleases_releaseAlreadyExists() throws IOException, GitAPIException {
- updateReleases0(LocalDateTime.of(2019, 2, 18, 22, 00), Collections.emptyList(), "Scripting JSP Tag Library", "2.4.0");
+ updateReleases0(LocalDateTime.of(2019, 2, 18, 22, 0), Collections.emptyList(), "Scripting JSP Tag Library", "2.4.0");
}
@Test
public void updateReleases_releaseInNewMonth() throws IOException, GitAPIException {
- updateReleases0(LocalDateTime.of(2019, 3, 15, 22, 00),
+ updateReleases0(LocalDateTime.of(2019, 3, 15, 22, 0),
Arrays.asList(
" ~~~~~~",
" This is a list of all our releases, available from our [downloads](/downloads.cgi) page.",
@@ -181,7 +183,7 @@ public class JBakeContentUpdaterTest {
@Test
public void updateReleases_releaseExistingMonthAndDay() throws IOException, GitAPIException {
- updateReleases0(LocalDateTime.of(2019, 2, 26, 22, 00),
+ updateReleases0(LocalDateTime.of(2019, 2, 26, 22, 0),
Arrays.asList(
" ",
" ## February 2019",
diff --git a/src/test/java/org/apache/sling/cli/impl/jira/CreateVersionJiraAction.java b/src/test/java/org/apache/sling/cli/impl/jira/CreateVersionJiraAction.java
index 09837bf..e06b5cb 100644
--- a/src/test/java/org/apache/sling/cli/impl/jira/CreateVersionJiraAction.java
+++ b/src/test/java/org/apache/sling/cli/impl/jira/CreateVersionJiraAction.java
@@ -64,7 +64,8 @@ public class CreateVersionJiraAction implements JiraAction {
return true;
}
- static class VersionToCreate {
+ @SuppressWarnings("unused")
+ private static class VersionToCreate {
private String name;
private String project;
@@ -84,8 +85,9 @@ public class CreateVersionJiraAction implements JiraAction {
this.project = project;
}
}
-
- static class CreatedVersion {
+
+ @SuppressWarnings("unused")
+ private static class CreatedVersion {
private String name;
private int id;
private boolean archived;
diff --git a/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java b/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
index ae75090..5ad42f8 100644
--- a/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/jira/VersionClientTest.java
@@ -56,7 +56,7 @@ public class VersionClientTest {
private VersionClient versionClient;
@Before
- public void prepareDependencies() throws ReflectiveOperationException {
+ public void prepareDependencies() {
context.registerInjectActivateService(new CredentialsService());
context.registerInjectActivateService(new HttpClientFactory(), "jira.host", "localhost", "jira.port", mockJira.getBoundPort());
diff --git a/src/test/java/org/apache/sling/cli/impl/junit/SystemPropertiesRule.java b/src/test/java/org/apache/sling/cli/impl/junit/SystemPropertiesRule.java
index 81a665a..1cb849d 100644
--- a/src/test/java/org/apache/sling/cli/impl/junit/SystemPropertiesRule.java
+++ b/src/test/java/org/apache/sling/cli/impl/junit/SystemPropertiesRule.java
@@ -25,15 +25,15 @@ import org.junit.rules.ExternalResource;
public class SystemPropertiesRule extends ExternalResource {
- private final Map<String, String> propsToRestore = new HashMap<String, String>();
+ private final Map<String, String> propsToRestore = new HashMap<>();
private final Map<String, String> propsToOverride;
-
+
public SystemPropertiesRule(Map<String, String> propsToOverride) {
this.propsToOverride = propsToOverride;
}
@Override
- protected void before() throws Throwable {
+ protected void before() {
for (Map.Entry<String, String> prop : propsToOverride.entrySet() )
propsToRestore.put(prop.getKey(), set(prop));
}
diff --git a/src/test/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidatorTest.java b/src/test/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidatorTest.java
index ce9a2f9..9d9ed28 100644
--- a/src/test/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidatorTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/pgp/PGPSignatureValidatorTest.java
@@ -76,12 +76,11 @@ public class PGPSignatureValidatorTest {
public void verifyInvalidPGPSignatures() {
Throwable expected = null;
try {
- PGPSignatureValidator.ValidationResult result =
- pgpSignatureValidator.verify(Paths.get("src/test/resources/nexus/orgapachesling-0" +
- "/org/apache/sling/adapter" +
- "-annotations/1.0" +
- ".0/adapter-annotations-1.0.0.pom"),
- Paths.get("src/test/resources/pgp/adapter-annotations-1.0.0.pom.invalid.asc"));
+ pgpSignatureValidator.verify(Paths.get("src/test/resources/nexus/orgapachesling-0" +
+ "/org/apache/sling/adapter" +
+ "-annotations/1.0" +
+ ".0/adapter-annotations-1.0.0.pom"),
+ Paths.get("src/test/resources/pgp/adapter-annotations-1.0.0.pom.invalid.asc"));
} catch (Throwable e) {
expected = e;
}
diff --git a/src/test/java/org/apache/sling/cli/impl/release/UpdateReporterCommandTest.java b/src/test/java/org/apache/sling/cli/impl/release/UpdateReporterCommandTest.java
index 8a11450..64863f1 100644
--- a/src/test/java/org/apache/sling/cli/impl/release/UpdateReporterCommandTest.java
+++ b/src/test/java/org/apache/sling/cli/impl/release/UpdateReporterCommandTest.java
@@ -19,10 +19,8 @@
package org.apache.sling.cli.impl.release;
import java.io.IOException;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -32,8 +30,8 @@ import org.apache.sling.cli.impl.ExecutionMode;
import org.apache.sling.cli.impl.InputOption;
import org.apache.sling.cli.impl.UserInput;
import org.apache.sling.cli.impl.http.HttpClientFactory;
-import org.apache.sling.cli.impl.nexus.StagingRepository;
import org.apache.sling.cli.impl.nexus.RepositoryService;
+import org.apache.sling.cli.impl.nexus.StagingRepository;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
import org.junit.Before;
import org.junit.Rule;