From a4bc28ba276058df718981b203f5438ee09ec7f6 Mon Sep 17 00:00:00 2001 From: Dexter Lowe Date: Sun, 21 Oct 2018 16:00:42 +0100 Subject: [PATCH] Upgrade dependencies --- pom.xml | 29 +++++++++++---- .../java/net/imagini/zkcli/CliParameters.java | 3 +- .../imagini/jzookeeperedit/ZkNodeTest.java | 8 +++-- .../jzookeeperedit/ZkTreeNodeTest.java | 19 ++++------ .../net/imagini/zkcli/CliParametersTest.java | 33 ++++++++--------- .../java/net/imagini/zkcli/ZkCliTest.java | 36 +++++++++---------- .../imagini/zkcli/ZkDeleteHandlerTest.java | 31 ++++++++-------- .../imagini/zkcli/ZkMetadataHandlerTest.java | 28 +++++++-------- .../net/imagini/zkcli/ZkReadHandlerTest.java | 23 ++++++------ 9 files changed, 108 insertions(+), 102 deletions(-) diff --git a/pom.xml b/pom.xml index 8954659..e55806f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ UTF-8 net.imagini.jzookeeperedit.fx.MainApp - 1.7.21 + 1.7.25 @@ -23,12 +23,23 @@ org.apache.curator curator-framework - 2.11.0 + 4.0.1 + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.13 org.controlsfx controlsfx - 8.40.12 + 8.40.14 org.slf4j @@ -43,7 +54,7 @@ com.beust jcommander - 1.58 + 1.72 @@ -55,13 +66,19 @@ org.mockito mockito-core - 2.1.0 + 2.23.0 test co.unruly java-8-matchers - 1.1 + 1.5 + test + + + org.hamcrest + java-hamcrest + 2.0.0.0 test diff --git a/src/main/java/net/imagini/zkcli/CliParameters.java b/src/main/java/net/imagini/zkcli/CliParameters.java index 7695dfe..c30b233 100644 --- a/src/main/java/net/imagini/zkcli/CliParameters.java +++ b/src/main/java/net/imagini/zkcli/CliParameters.java @@ -142,8 +142,9 @@ public CliParameters(List args, ZkClusterManager clusterManager) { */ public CliParameters(String[] args, ZkClusterManager clusterManager) { this.clusterManager = clusterManager; - argProcessor = new JCommander(this, args); + argProcessor = new JCommander(this); argProcessor.setProgramName(programName); + argProcessor.parse(args); blacklist.add("/zookeeper"); } diff --git a/src/test/java/net/imagini/jzookeeperedit/ZkNodeTest.java b/src/test/java/net/imagini/jzookeeperedit/ZkNodeTest.java index bfe7405..65f1f25 100644 --- a/src/test/java/net/imagini/jzookeeperedit/ZkNodeTest.java +++ b/src/test/java/net/imagini/jzookeeperedit/ZkNodeTest.java @@ -5,17 +5,19 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import static org.junit.Assert.*; -@RunWith(MockitoJUnitRunner.class) public class ZkNodeTest { private static final String NODE_LABEL = "someNode"; + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/src/test/java/net/imagini/jzookeeperedit/ZkTreeNodeTest.java b/src/test/java/net/imagini/jzookeeperedit/ZkTreeNodeTest.java index d648db0..4dcfd43 100644 --- a/src/test/java/net/imagini/jzookeeperedit/ZkTreeNodeTest.java +++ b/src/test/java/net/imagini/jzookeeperedit/ZkTreeNodeTest.java @@ -12,27 +12,21 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) public class ZkTreeNodeTest { private static final Charset CHARSET = java.nio.charset.StandardCharsets.UTF_8; private static final String NODE_NAME = "aNode"; @@ -40,8 +34,8 @@ public class ZkTreeNodeTest { private static final String VALID_PATH = "/valid/path"; private static final String DATA = "Some very interesting\nDATA!!!!!!!"; - private List validPathChildren; - + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -59,6 +53,7 @@ public class ZkTreeNodeTest { private GetChildrenBuilder mockGetChildrenBuilder; private ZkTreeNode unit; + private List validPathChildren; @Before public void setup() throws Exception { diff --git a/src/test/java/net/imagini/zkcli/CliParametersTest.java b/src/test/java/net/imagini/zkcli/CliParametersTest.java index ed03cd3..1f8237d 100644 --- a/src/test/java/net/imagini/zkcli/CliParametersTest.java +++ b/src/test/java/net/imagini/zkcli/CliParametersTest.java @@ -1,32 +1,27 @@ package net.imagini.zkcli; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.contains; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; +import com.beust.jcommander.ParameterException; +import net.imagini.jzookeeperedit.ZkClusterManager; +import org.apache.curator.framework.CuratorFramework; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.io.PrintStream; import java.util.Arrays; import java.util.Collections; import java.util.Optional; -import org.apache.curator.framework.CuratorFramework; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; - -import net.imagini.jzookeeperedit.ZkClusterManager; - -import com.beust.jcommander.ParameterException; +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) public class CliParametersTest { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + @Mock private CuratorFramework mockClient; @Mock diff --git a/src/test/java/net/imagini/zkcli/ZkCliTest.java b/src/test/java/net/imagini/zkcli/ZkCliTest.java index 002ec6e..1429ddc 100644 --- a/src/test/java/net/imagini/zkcli/ZkCliTest.java +++ b/src/test/java/net/imagini/zkcli/ZkCliTest.java @@ -1,14 +1,14 @@ package net.imagini.zkcli; -import static org.junit.Assert.assertNotNull; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anySet; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.apache.curator.framework.CuratorFramework; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.InOrder; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import java.io.PrintStream; import java.lang.reflect.Field; @@ -19,18 +19,16 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Stream; -import org.apache.curator.framework.CuratorFramework; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.mockito.InOrder; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import static org.junit.Assert.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anySet; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) public class ZkCliTest { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/src/test/java/net/imagini/zkcli/ZkDeleteHandlerTest.java b/src/test/java/net/imagini/zkcli/ZkDeleteHandlerTest.java index ab68b79..03a1bab 100644 --- a/src/test/java/net/imagini/zkcli/ZkDeleteHandlerTest.java +++ b/src/test/java/net/imagini/zkcli/ZkDeleteHandlerTest.java @@ -1,32 +1,29 @@ package net.imagini.zkcli; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; - import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.BackgroundVersionable; import org.apache.curator.framework.api.DeleteBuilder; import org.apache.curator.framework.api.GetChildrenBuilder; import org.apache.zookeeper.KeeperException; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) public class ZkDeleteHandlerTest { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); @Mock private CuratorFramework client; diff --git a/src/test/java/net/imagini/zkcli/ZkMetadataHandlerTest.java b/src/test/java/net/imagini/zkcli/ZkMetadataHandlerTest.java index f569c9f..338a0ae 100644 --- a/src/test/java/net/imagini/zkcli/ZkMetadataHandlerTest.java +++ b/src/test/java/net/imagini/zkcli/ZkMetadataHandlerTest.java @@ -1,16 +1,5 @@ package net.imagini.zkcli; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.ExistsBuilder; import org.apache.curator.framework.api.GetChildrenBuilder; @@ -18,13 +7,24 @@ import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.data.Stat; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; -@RunWith(MockitoJUnitRunner.class) public class ZkMetadataHandlerTest { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); + @Mock private CuratorFramework client; diff --git a/src/test/java/net/imagini/zkcli/ZkReadHandlerTest.java b/src/test/java/net/imagini/zkcli/ZkReadHandlerTest.java index 6bf4943..576d09f 100644 --- a/src/test/java/net/imagini/zkcli/ZkReadHandlerTest.java +++ b/src/test/java/net/imagini/zkcli/ZkReadHandlerTest.java @@ -1,28 +1,29 @@ package net.imagini.zkcli; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; - -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; - +import co.unruly.matchers.StreamMatchers; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.ExistsBuilder; import org.apache.curator.framework.api.GetChildrenBuilder; import org.apache.curator.framework.api.GetDataBuilder; import org.apache.zookeeper.KeeperException; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; -import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; -import co.unruly.matchers.StreamMatchers; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; -@RunWith(MockitoJUnitRunner.class) public class ZkReadHandlerTest { + @Rule + public MockitoRule mockito = MockitoJUnit.rule(); @Mock private CuratorFramework client;