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/12/05 10:26:54 UTC
ant-ivy git commit: keep test parts as private as possible
Repository: ant-ivy
Updated Branches:
refs/heads/master 4e2846d5f -> 5d7896111
keep test parts as private as possible
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5d789611
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5d789611
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5d789611
Branch: refs/heads/master
Commit: 5d7896111816441de05158671897406f6476baf5
Parents: 4e2846d
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Tue Dec 5 11:26:24 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Tue Dec 5 11:26:24 2017 +0100
----------------------------------------------------------------------
.../org/apache/ivy/ant/AntCallTriggerTest.java | 2 +-
.../DefaultRepositoryCacheManagerTest.java | 8 +++----
.../cache/ModuleDescriptorMemoryCacheTest.java | 24 ++++++++++----------
.../ivy/core/publish/PublishEventsTest.java | 2 +-
.../UpdateSiteAndIbiblioResolverTest.java | 4 ++--
.../ivy/plugins/repository/vfs/VfsURI.java | 14 ++++++------
.../ivy/plugins/resolver/MockResolver.java | 2 +-
.../plugins/resolver/PackagerResolverTest.java | 2 +-
.../plugins/resolver/ResolverTestHelper.java | 8 +++----
.../ivy/plugins/resolver/VfsResolverTest.java | 2 +-
.../version/VersionRangeMatcherTest.java | 2 +-
11 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
index cb1ec59..b34b966 100644
--- a/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
+++ b/test/java/org/apache/ivy/ant/AntCallTriggerTest.java
@@ -162,7 +162,7 @@ public class AntCallTriggerTest {
* @param level
* log level
*/
- protected void addBuildListeners(Project project, int level) {
+ private void addBuildListeners(Project project, int level) {
// Add the default listener
project.addBuildListener(createLogger(level));
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
index a31d826..2333802 100644
--- a/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
+++ b/test/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManagerTest.java
@@ -24,7 +24,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-import java.text.ParseException;
import java.util.Date;
import org.apache.ivy.Ivy;
@@ -170,7 +169,8 @@ public class DefaultRepositoryCacheManagerTest {
}
};
ModuleDescriptorWriter writer = new ModuleDescriptorWriter() {
- public void write(ResolvedResource originalMdResource, ModuleDescriptor md, File src, File dest) throws IOException, ParseException {
+ public void write(ResolvedResource originalMdResource, ModuleDescriptor md, File src,
+ File dest) throws IOException {
XmlModuleDescriptorWriter.write(md, dest);
}
};
@@ -192,8 +192,8 @@ public class DefaultRepositoryCacheManagerTest {
assertEquals(rmr11, rmrFromCache);
}
- protected static DefaultArtifact createArtifact(String org, String module, String rev, String name,
- String type, String ext) {
+ private static DefaultArtifact createArtifact(String org, String module, String rev,
+ String name, String type, String ext) {
ModuleId mid = new ModuleId(org, module);
ModuleRevisionId mrid = new ModuleRevisionId(mid, rev);
return new DefaultArtifact(mrid, new Date(), name, type, ext);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
index d28a4a1..bd3157f 100644
--- a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
+++ b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
@@ -33,29 +33,29 @@ import org.junit.Test;
public class ModuleDescriptorMemoryCacheTest {
- ModuleDescriptorMemoryCache cache = new ModuleDescriptorMemoryCache(2);
+ private ModuleDescriptorMemoryCache cache = new ModuleDescriptorMemoryCache(2);
- ParserSettings ivySettings = new IvySettings();
+ private ParserSettings ivySettings = new IvySettings();
- IvySettings ivySettings2 = new IvySettings();
+ private IvySettings ivySettings2 = new IvySettings();
- File url1 = new File("file://cached/file.txt");
+ private File url1 = new File("file://cached/file.txt");
- File url2 = new File("file://cached/file2.txt");
+ private File url2 = new File("file://cached/file2.txt");
- File url3 = new File("file://cached/file3.txt");
+ private File url3 = new File("file://cached/file3.txt");
- ModuleRevisionId mrid1 = ModuleRevisionId.newInstance("org", "name", "rev");
+ private ModuleRevisionId mrid1 = ModuleRevisionId.newInstance("org", "name", "rev");
- ModuleDescriptor md1 = DefaultModuleDescriptor.newDefaultInstance(mrid1);
+ private ModuleDescriptor md1 = DefaultModuleDescriptor.newDefaultInstance(mrid1);
- ModuleRevisionId mrid2 = ModuleRevisionId.newInstance("org", "name", "rev2");
+ private ModuleRevisionId mrid2 = ModuleRevisionId.newInstance("org", "name", "rev2");
- ModuleDescriptor md2 = DefaultModuleDescriptor.newDefaultInstance(mrid2);
+ private ModuleDescriptor md2 = DefaultModuleDescriptor.newDefaultInstance(mrid2);
- ModuleRevisionId mrid3 = ModuleRevisionId.newInstance("org", "name", "rev3");
+ private ModuleRevisionId mrid3 = ModuleRevisionId.newInstance("org", "name", "rev3");
- ModuleDescriptor md3 = DefaultModuleDescriptor.newDefaultInstance(mrid3);
+ private ModuleDescriptor md3 = DefaultModuleDescriptor.newDefaultInstance(mrid3);
@Test
public void testUseModuleDescriptorProviderWhenModuleNotCached() throws ParseException,
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/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 5167bcd..83cfa35 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -162,7 +162,7 @@ public class PublishEventsTest {
ivyFile = null;
}
- protected void resetCounters() {
+ private void resetCounters() {
preTriggers = 0;
postTriggers = 0;
publications = 0;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
index 51f5309..b04d2b9 100644
--- a/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
@@ -43,7 +43,7 @@ public class UpdateSiteAndIbiblioResolverTest {
private UpdateSiteResolver resolver;
- IBiblioResolver resolver2;
+ private IBiblioResolver resolver2;
private File cache;
@@ -51,7 +51,7 @@ public class UpdateSiteAndIbiblioResolverTest {
private ResolveData data;
- ChainResolver chain;
+ private ChainResolver chain;
@Before
public void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
index bfcf3c7..1b4c024 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
@@ -33,19 +33,19 @@ public class VfsURI {
private String user;
// VFS Schemes
- public static final String SCHEME_CIFS = "smb";
+ private static final String SCHEME_CIFS = "smb";
- public static final String SCHEME_FILE = "file";
+ private static final String SCHEME_FILE = "file";
- public static final String SCHEME_FTP = "ftp";
+ private static final String SCHEME_FTP = "ftp";
- public static final String SCHEME_HTTP = "http";
+ private static final String SCHEME_HTTP = "http";
- public static final String SCHEME_HTTPS = "https";
+ private static final String SCHEME_HTTPS = "https";
- public static final String SCHEME_SFTP = "sftp";
+ private static final String SCHEME_SFTP = "sftp";
- public static final String SCHEME_WEBDAV = "webdav";
+ private static final String SCHEME_WEBDAV = "webdav";
public static final String[] SUPPORTED_SCHEMES = new String[] {
// add other schemes here if other can be tested on your machine
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/MockResolver.java b/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
index d7c9f65..284d5bf 100644
--- a/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
+++ b/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
@@ -66,7 +66,7 @@ public class MockResolver extends AbstractResolver {
List<DependencyDescriptor> askedDeps = new ArrayList<>();
- ResolvedModuleRevision rmr;
+ private ResolvedModuleRevision rmr;
public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data)
throws ParseException {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/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 413d6ec..691e6a6 100644
--- a/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
@@ -95,7 +95,7 @@ public class PackagerResolverTest extends AbstractDependencyResolverTest {
cleanupTempDirs();
}
- protected void cleanupTempDirs() {
+ private void cleanupTempDirs() {
FileUtil.forceDelete(workdir);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
index 7312b3b..58d5e44 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
@@ -65,8 +65,8 @@ public class ResolverTestHelper {
assertModuleEntriesContains(resolver, org, names, mods);
}
- static void assertModuleEntriesContains(DependencyResolver resolver, OrganisationEntry org,
- String[] names, ModuleEntry[] mods) {
+ private static void assertModuleEntriesContains(DependencyResolver resolver, OrganisationEntry org,
+ String[] names, ModuleEntry[] mods) {
assertNotNull(mods);
for (String name : names) {
boolean found = false;
@@ -90,8 +90,8 @@ public class ResolverTestHelper {
assertRevisionEntriesContains(resolver, mod, names, revs);
}
- static void assertRevisionEntriesContains(DependencyResolver resolver, ModuleEntry mod,
- String[] names, RevisionEntry[] revs) {
+ private static void assertRevisionEntriesContains(DependencyResolver resolver, ModuleEntry mod,
+ String[] names, RevisionEntry[] revs) {
assertNotNull(revs);
for (String name : names) {
boolean found = false;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
index cff4a81..563e0e0 100644
--- a/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class VfsResolverTest extends AbstractDependencyResolverTest {
- VfsResolver resolver = null;
+ private VfsResolver resolver = null;
@Before
public void setUp() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5d789611/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
index 3167ddb..fd576ae 100644
--- a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
+++ b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class VersionRangeMatcherTest {
- final VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy());
+ private final VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy());
@Test
public void testMavenExcludeParenthesis() {