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/25 17:28:33 UTC
ant-ivy git commit: refactor and fix test
Repository: ant-ivy
Updated Branches:
refs/heads/master 90c42ec03 -> b691f81b4
refactor and fix test
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/b691f81b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/b691f81b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/b691f81b
Branch: refs/heads/master
Commit: b691f81b482175665b45cabc056e58ab0df03ff8
Parents: 90c42ec
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Aug 25 19:26:46 2017 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Aug 25 19:26:46 2017 +0200
----------------------------------------------------------------------
.../DefaultDependencyDescriptorTest.java | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b691f81b/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java b/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
index 099d996..b0aeb9d 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptorTest.java
@@ -20,6 +20,8 @@ package org.apache.ivy.core.module.descriptor;
import org.junit.Test;
+import static org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor.replaceSelfFallbackPattern;
+import static org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor.replaceThisFallbackPattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -31,15 +33,11 @@ public class DefaultDependencyDescriptorTest {
*/
@Test
public void testReplaceSelfFallbackPattern() {
- String replacedConf = DefaultDependencyDescriptor.replaceSelfFallbackPattern("@(default)",
- "compile");
- assertEquals("compile(default)", replacedConf);
+ assertEquals("compile(default)", replaceSelfFallbackPattern("@(default)", "compile"));
- replacedConf = DefaultDependencyDescriptor.replaceSelfFallbackPattern("default", "compile");
- assertNull(replacedConf);
+ assertNull(replaceSelfFallbackPattern("default", "compile"));
- replacedConf = DefaultDependencyDescriptor.replaceSelfFallbackPattern("@", "runtime");
- assertEquals("runtime", "runtime");
+ assertEquals("runtime", replaceSelfFallbackPattern("@", "runtime"));
}
@@ -49,15 +47,11 @@ public class DefaultDependencyDescriptorTest {
*/
@Test
public void testReplaceThisFallbackPattern() {
- String replacedConf = DefaultDependencyDescriptor.replaceThisFallbackPattern("#(default)",
- "compile");
- assertEquals("compile(default)", replacedConf);
+ assertEquals("compile(default)", replaceThisFallbackPattern("#(default)", "compile"));
- replacedConf = DefaultDependencyDescriptor.replaceThisFallbackPattern("default", "compile");
- assertNull(replacedConf);
+ assertNull(replaceThisFallbackPattern("default", "compile"));
- replacedConf = DefaultDependencyDescriptor.replaceThisFallbackPattern("#", "runtime");
- assertEquals("runtime", "runtime");
+ assertEquals("runtime", replaceThisFallbackPattern("#", "runtime"));
}