Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 519191022A for ; Tue, 11 Jun 2013 19:13:54 +0000 (UTC) Received: (qmail 15513 invoked by uid 500); 11 Jun 2013 19:13:54 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 15492 invoked by uid 500); 11 Jun 2013 19:13:54 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 15485 invoked by uid 99); 11 Jun 2013 19:13:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jun 2013 19:13:54 +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; Tue, 11 Jun 2013 19:13:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C68722388847; Tue, 11 Jun 2013 19:13:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491910 - in /accumulo/branches/1.4/src/core: ./ src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Date: Tue, 11 Jun 2013 19:13:33 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130611191333.C68722388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Tue Jun 11 19:13:33 2013 New Revision: 1491910 URL: http://svn.apache.org/r1491910 Log: ACCUMULO-1505 - fixing up some warnings in the patch Modified: accumulo/branches/1.4/src/core/ (props changed) accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Propchange: accumulo/branches/1.4/src/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1491900 Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java?rev=1491910&r1=1491909&r2=1491910&view=diff ============================================================================== --- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java (original) +++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java Tue Jun 11 19:13:33 2013 @@ -16,9 +16,9 @@ */ package org.apache.accumulo.core.client.mock; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collections; @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.Random; -import junit.framework.Assert; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -48,6 +46,7 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.iterators.user.SummingCombiner; import org.apache.accumulo.core.security.Authorizations; import org.apache.hadoop.io.Text; +import org.junit.Assert; import org.junit.Test; public class MockConnectorTest { @@ -108,7 +107,7 @@ public class MockConnectorTest { Assert.fail("addMutations should throw IAE for null iterable"); } catch (IllegalArgumentException iae) {} - bw.addMutations(Collections.EMPTY_LIST); + bw.addMutations(Collections.emptyList()); Mutation bad = new Mutation("bad"); try {