You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2017/08/21 21:44:54 UTC
ant-ivy git commit: more asList() refactoring and code cleanup
Repository: ant-ivy
Updated Branches:
refs/heads/master fe85e77f2 -> 9c14146a9
more asList() refactoring and code cleanup
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/9c14146a
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/9c14146a
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/9c14146a
Branch: refs/heads/master
Commit: 9c14146a98888377702bfb217dee1dfb6892ec30
Parents: fe85e77
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Aug 21 23:44:30 2017 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Aug 21 23:44:30 2017 +0200
----------------------------------------------------------------------
test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java | 3 ++-
test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java | 2 +-
test/java/org/apache/ivy/core/publish/PublishEngineTest.java | 4 ++--
test/java/org/apache/ivy/core/publish/PublishEventsTest.java | 2 +-
test/java/org/apache/ivy/core/retrieve/RetrieveTest.java | 7 +++----
.../plugins/circular/WarnCircularDependencyStrategyTest.java | 4 +++-
.../apache/ivy/plugins/latest/LatestRevisionStrategyTest.java | 4 ++--
.../org/apache/ivy/plugins/resolver/ChainResolverTest.java | 1 -
.../org/apache/ivy/plugins/resolver/PackagerResolverTest.java | 2 +-
9 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
index 3d8a489..fa07563 100644
--- a/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
+++ b/test/java/org/apache/ivy/ant/IvyCacheFilesetTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.apache.ivy.TestHelper;
@@ -235,7 +236,7 @@ public class IvyCacheFilesetTest {
// we expect a BuildException when we try to find a (non-existent) common base dir
// across file system roots
expExc.expect(BuildException.class);
- List<ArtifactDownloadReport> reports = Arrays.asList();
+ List<ArtifactDownloadReport> reports = Collections.emptyList();
fileset.requireCommonBaseDir(reports);
fail("A BuildException was expected when trying to find a common base dir.");
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
index 68be4d3..610cb58 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
@@ -38,7 +38,7 @@ public class ModuleRulesTest {
@Before
public void setUp() {
- rules = new ModuleRules<String>();
+ rules = new ModuleRules<>();
rule = new String[10];
for (int i = 0; i < rule.length; i++) {
rule[i] = "RULE_" + i;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
index a8d9dac..b02028c 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
@@ -20,7 +20,7 @@ package org.apache.ivy.core.publish;
import java.io.File;
import java.io.IOException;
import java.text.ParseException;
-import java.util.Arrays;
+import java.util.Collections;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -93,7 +93,7 @@ public class PublishEngineTest {
new Thread() {
public void run() {
try {
- engine.publish(md, Arrays.asList("build/test/publish/module/[artifact].[ext]"),
+ engine.publish(md, Collections.singletonList("build/test/publish/module/[artifact].[ext]"),
resolver, new PublishOptions().setSrcIvyPattern("build/test/publish/module/[artifact].[ext]"));
synchronized (PublishEngineTest.this) {
counter[0]++;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 1f014b1..dab9c2e 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -371,7 +371,7 @@ public class PublishEventsTest {
// we test file separately, since it is hard to guarantee an exact path match, but we
// want to make sure that both paths point to the same canonical location on the
// filesystem
- String filePath = event.getAttributes().get("file").toString();
+ String filePath = event.getAttributes().get("file");
assertEquals("event declares correct value for file",
expectedData.getCanonicalPath(), new File(filePath).getCanonicalPath());
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
index d09c58e..db03d0b 100644
--- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
+++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java
@@ -293,9 +293,8 @@ public class RetrieveTest {
* {@link Files#exists(Path, LinkOption...) exists}
*
* @param filePath
- * @throws IOException if something goes wrong
*/
- private void assertLinkOrExists(final String filePath) throws IOException {
+ private void assertLinkOrExists(final String filePath) {
if (systemHasSymlinkAbility) {
assertTrue(filePath + " was expected to be a symlink", Files.isSymbolicLink(Paths.get(filePath)));
return;
@@ -496,7 +495,7 @@ public class RetrieveTest {
assertTrue("Artifact file for " + fooBar123Mrid + " isn't a file, in cache at " + fooBar123ArtifactInCache,
fooBar123ArtifactInCache.isFile());
final byte[] fooBar123ArtifactContentsInCache = Files.readAllBytes(fooBar123ArtifactInCache.toPath());
- assertTrue("Artifact content was empty at " + fooBar123ArtifactContentsInCache, fooBar123ArtifactContentsInCache.length > 0);
+ assertTrue("Artifact content was empty at " + new String(fooBar123ArtifactContentsInCache), fooBar123ArtifactContentsInCache.length > 0);
// now do a retrieve of the resolved module
@@ -533,7 +532,7 @@ public class RetrieveTest {
assertTrue("Artifact file for " + fooBar234Mrid + " isn't a file, in cache at " + foobar234InCache,
foobar234InCache.isFile());
final byte[] foobar234CacheFileContents = Files.readAllBytes(foobar234InCache.toPath());
- assertTrue("Artifact content was empty at " + foobar234CacheFileContents, foobar234CacheFileContents.length > 0);
+ assertTrue("Artifact content was empty at " + new String(foobar234CacheFileContents), foobar234CacheFileContents.length > 0);
// do the retrieve with symlinks disabled
ivy.retrieve(resolve2Report.getModuleDescriptor().getModuleRevisionId(),
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
index c3f6524..f643864 100644
--- a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
@@ -27,6 +27,7 @@ import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.core.sort.SortEngine;
import org.apache.ivy.util.MessageLoggerEngine;
import org.apache.ivy.util.MockMessageLogger;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +48,8 @@ public class WarnCircularDependencyStrategyTest {
loggerEngine = setupMockLogger(mockMessageLogger);
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() {
resetMockLogger(loggerEngine);
// pop the context we setup before
IvyContext.popContext();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java b/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java
index dbcf3e0..1b48faa 100644
--- a/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java
+++ b/test/java/org/apache/ivy/plugins/latest/LatestRevisionStrategyTest.java
@@ -80,11 +80,11 @@ public class LatestRevisionStrategyTest {
LatestRevisionStrategy latestRevisionStrategy = new LatestRevisionStrategy();
LatestRevisionStrategy.SpecialMeaning specialMeaning = new LatestRevisionStrategy.SpecialMeaning();
specialMeaning.setName("pre");
- specialMeaning.setValue(new Integer(-2));
+ specialMeaning.setValue(-2);
latestRevisionStrategy.addConfiguredSpecialMeaning(specialMeaning);
specialMeaning = new LatestRevisionStrategy.SpecialMeaning();
specialMeaning.setName("QA");
- specialMeaning.setValue(new Integer(4));
+ specialMeaning.setValue(4);
latestRevisionStrategy.addConfiguredSpecialMeaning(specialMeaning);
Collections.sort(shuffled, latestRevisionStrategy.new ArtifactInfoComparator());
assertEquals(Arrays.asList(revs), shuffled);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index 5fb7932..e318df7 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9c14146a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
index e897c51..a82cf27 100644
--- a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
@@ -92,7 +92,7 @@ public class PackagerResolverTest extends AbstractDependencyResolverTest {
cleanupTempDirs();
}
- protected void cleanupTempDirs() throws Exception {
+ protected void cleanupTempDirs() {
FileUtil.forceDelete(workdir);
}