Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 172B9200B8A for ; Sat, 10 Sep 2016 00:02:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15CD7160ACA; Fri, 9 Sep 2016 22:02:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 35EDE160AC2 for ; Sat, 10 Sep 2016 00:02:53 +0200 (CEST) Received: (qmail 1718 invoked by uid 500); 9 Sep 2016 22:02:52 -0000 Mailing-List: contact commits-help@gossip.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gossip.incubator.apache.org Delivered-To: mailing list commits@gossip.incubator.apache.org Received: (qmail 1703 invoked by uid 99); 9 Sep 2016 22:02:52 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Sep 2016 22:02:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BD53B1804F7 for ; Fri, 9 Sep 2016 22:02:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id A_7bJUcwLAHT for ; Fri, 9 Sep 2016 22:02:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 4C88C5F252 for ; Fri, 9 Sep 2016 22:02:49 +0000 (UTC) Received: (qmail 1644 invoked by uid 99); 9 Sep 2016 22:02:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Sep 2016 22:02:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D037E025B; Fri, 9 Sep 2016 22:02:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecapriolo@apache.org To: commits@gossip.incubator.apache.org Date: Fri, 09 Sep 2016 22:02:48 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-gossip git commit: GOSSIP-11: introducing junit5 archived-at: Fri, 09 Sep 2016 22:02:54 -0000 Repository: incubator-gossip Updated Branches: refs/heads/master 4e13c899f -> bbd453192 GOSSIP-11: introducing junit5 Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/316e8e75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/316e8e75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/316e8e75 Branch: refs/heads/master Commit: 316e8e752d9ed71c5facbcfe7f2308450edb6835 Parents: 4e13c89 Author: chandresh-pancholi Authored: Fri Sep 9 21:16:07 2016 +0530 Committer: chandresh-pancholi Committed: Fri Sep 9 21:16:07 2016 +0530 ---------------------------------------------------------------------- pom.xml | 10 +++--- .../org/apache/gossip/ShutdownDeadtimeTest.java | 2 +- .../org/apache/gossip/StartupSettingsTest.java | 2 +- .../org/apache/gossip/TenNodeThreeSeedTest.java | 2 +- .../manager/RandomGossipManagerBuilderTest.java | 34 +++++++++++++------- 5 files changed, 31 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/316e8e75/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7639d32..94e0018 100644 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,14 @@ jackson-datatype-json-org ${jackson-datatype-json-org.version} + - junit - junit - ${junit.version} - test + org.junit.jupiter + junit-jupiter-api + 5.0.0-M2 + + io.teknek tunit http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/316e8e75/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java b/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java index 98acb05..251550b 100644 --- a/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java +++ b/src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java @@ -31,10 +31,10 @@ import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; -import org.junit.Test; import org.apache.gossip.event.GossipListener; import org.apache.gossip.event.GossipState; +import org.junit.jupiter.api.Test; public class ShutdownDeadtimeTest { http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/316e8e75/src/test/java/org/apache/gossip/StartupSettingsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/gossip/StartupSettingsTest.java b/src/test/java/org/apache/gossip/StartupSettingsTest.java index 4b064ec..ed069c3 100644 --- a/src/test/java/org/apache/gossip/StartupSettingsTest.java +++ b/src/test/java/org/apache/gossip/StartupSettingsTest.java @@ -19,9 +19,9 @@ package org.apache.gossip; import org.apache.log4j.Logger; import org.json.JSONException; -import org.junit.Test; import io.teknek.tunit.TUnit; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileOutputStream; http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/316e8e75/src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java b/src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java index dd7d021..350fc6f 100644 --- a/src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java +++ b/src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java @@ -30,10 +30,10 @@ import java.util.concurrent.TimeUnit; import org.apache.log4j.Logger; -import org.junit.Test; import org.apache.gossip.event.GossipListener; import org.apache.gossip.event.GossipState; +import org.junit.jupiter.api.Test; public class TenNodeThreeSeedTest { private static final Logger log = Logger.getLogger( TenNodeThreeSeedTest.class ); http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/316e8e75/src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java b/src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java index 4d77460..6c63516 100644 --- a/src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java +++ b/src/test/java/org/apache/gossip/manager/RandomGossipManagerBuilderTest.java @@ -23,8 +23,7 @@ import org.apache.gossip.LocalGossipMember; import org.apache.gossip.event.GossipListener; import org.apache.gossip.event.GossipState; import org.apache.gossip.manager.random.RandomGossipManager; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.management.Notification; import javax.management.NotificationListener; @@ -34,6 +33,11 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.expectThrows; + + public class RandomGossipManagerBuilderTest { public static class TestGossipListener implements GossipListener { @@ -50,21 +54,27 @@ public class RandomGossipManagerBuilderTest { } } - @Test(expected=IllegalArgumentException.class) + @Test public void idShouldNotBeNull() { - RandomGossipManager.newBuilder().cluster("aCluster").build(); + expectThrows(IllegalArgumentException.class,() -> { + RandomGossipManager.newBuilder().cluster("aCluster").build(); + }); } - @Test(expected=IllegalArgumentException.class) + @Test public void clusterShouldNotBeNull() { - RandomGossipManager.newBuilder().withId("id").build(); + expectThrows(IllegalArgumentException.class,() -> { + RandomGossipManager.newBuilder().withId("id").build(); + }); } - @Test(expected=IllegalArgumentException.class) + @Test public void settingsShouldNotBeNull() { - RandomGossipManager.newBuilder().withId("id").cluster("aCluster").build(); - } + expectThrows(IllegalArgumentException.class,() -> { + RandomGossipManager.newBuilder().withId("id").cluster("aCluster").build(); + }); + } @Test public void createMembersListIfNull() throws URISyntaxException { RandomGossipManager gossipManager = RandomGossipManager.newBuilder() @@ -74,7 +84,7 @@ public class RandomGossipManagerBuilderTest { .settings(new GossipSettings()) .gossipMembers(null).build(); - Assert.assertNotNull(gossipManager.getLiveMembers()); + assertNotNull(gossipManager.getLiveMembers()); } @Test @@ -89,8 +99,8 @@ public class RandomGossipManagerBuilderTest { .settings(new GossipSettings()) .uri(new URI("udp://localhost:8000")) .gossipMembers(memberList).build(); - Assert.assertEquals(1, gossipManager.getLiveMembers().size()); - Assert.assertEquals(member.getId(), gossipManager.getLiveMembers().get(0).getId()); + assertEquals(1, gossipManager.getLiveMembers().size()); + assertEquals(member.getId(), gossipManager.getLiveMembers().get(0).getId()); } } \ No newline at end of file