From commits-return-2531-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org Fri Jul 27 15:08:42 2012 Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BBF0CD3B3 for ; Fri, 27 Jul 2012 15:08:42 +0000 (UTC) Received: (qmail 63495 invoked by uid 500); 27 Jul 2012 15:08:41 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 63473 invoked by uid 500); 27 Jul 2012 15:08:41 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 63465 invoked by uid 99); 27 Jul 2012 15:08:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2012 15:08:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Jul 2012 15:08:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DFAEA23888E4 for ; Fri, 27 Jul 2012 15:07:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1366409 - in /zookeeper/bookkeeper/branches/branch-4.1: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java Date: Fri, 27 Jul 2012 15:07:56 -0000 To: commits@zookeeper.apache.org From: fpj@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120727150756.DFAEA23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fpj Date: Fri Jul 27 15:07:56 2012 New Revision: 1366409 URL: http://svn.apache.org/viewvc?rev=1366409&view=rev Log: BOOKKEEPER-352: Should not use static ServerStats/BKStats instance in TestServerStats/TestBKStats (sijie via fpj) Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt?rev=1366409&r1=1366408&r2=1366409&view=diff ============================================================================== --- zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt (original) +++ zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt Fri Jul 27 15:07:56 2012 @@ -10,7 +10,9 @@ Release 4.1.1 - UNRELEASED BUGFIXES: - BOOKKEEPER-298: We run with preferIPv4Stack in the scripts but not in the tests (ivank) + BOOKKEEPER-298: We run with preferIPv4Stack in the scripts but not in the tests (ivank)Q + + BOOKKEEPER-352: Should not use static ServerStats/BKStats instance in TestServerStats/TestBKStats (sijie via fpj) bookkeeper-server/ Modified: zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java?rev=1366409&r1=1366408&r2=1366409&view=diff ============================================================================== --- zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java (original) +++ zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java Fri Jul 27 15:07:56 2012 @@ -35,11 +35,9 @@ public class TestBKStats { @Test public void testUpdateLatencyShouldNotFailWithAIOBEWithNegativeLatency() throws Exception { - BKStats stats = BKStats.getInstance(); - OpStats opStat = stats.getOpStats(0); + OpStats opStat = new OpStats(); opStat.updateLatency(-10); assertEquals("Should not update any latency metrics", 0, opStat.numSuccessOps); - } } Modified: zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java?rev=1366409&r1=1366408&r2=1366409&view=diff ============================================================================== --- zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java (original) +++ zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java Fri Jul 27 15:07:56 2012 @@ -2,7 +2,7 @@ package org.apache.hedwig.server.netty; import static org.junit.Assert.assertEquals; -import org.apache.hedwig.protocol.PubSubProtocol.OperationType; +import org.apache.hedwig.server.netty.ServerStats.OpStats; import org.junit.Test; /** Tests that Statistics updation in hedwig Server */ @@ -15,9 +15,7 @@ public class TestServerStats { @Test public void testUpdateLatencyShouldNotFailWithAIOBEWithNegativeLatency() throws Exception { - ServerStats stats = ServerStats.getInstance(); - org.apache.hedwig.server.netty.ServerStats.OpStats opStat = stats - .getOpStats(OperationType.SUBSCRIBE); + OpStats opStat = new OpStats(); opStat.updateLatency(-10); assertEquals("Should not update any latency metrics", 0, opStat.numSuccessOps);