ACCUMULO-1505 - fixing up some warnings in the patch
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1491910 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6b11a329 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6b11a329 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6b11a329 Branch: refs/heads/master Commit: 6b11a329c1de23045cfa040e80fe2503160da88e Parents: 225d728 Author: John Vines <[email protected]> Authored: Tue Jun 11 19:13:33 2013 +0000 Committer: John Vines <[email protected]> Committed: Tue Jun 11 19:13:33 2013 +0000 ---------------------------------------------------------------------- .../accumulo/core/client/mock/MockConnectorTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b11a329/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java ---------------------------------------------------------------------- diff --git a/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java index 6fa9dff..1e36502 100644 --- a/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java +++ b/src/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java @@ -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.iterators.Combiner; 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.<Mutation>emptyList()); Mutation bad = new Mutation("bad"); try {
