ACCUMULO-4640 Fix broken SiteConfigurationTest Avoid using non-existent constructor in mock object creation Also fix a trivial javadoc warning Also fix a trivial test failure with Java 8 and Powermock
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/de83e61c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de83e61c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de83e61c Branch: refs/heads/1.8 Commit: de83e61c7f965b6f83482c6070b483bd1835b5a6 Parents: 4effd0e Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jun 12 14:23:39 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jun 12 14:23:39 2017 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/file/rfile/RFile.java | 2 +- .../org/apache/accumulo/core/conf/SiteConfigurationTest.java | 5 ++--- .../java/org/apache/accumulo/shell/ShellSetInstanceTest.java | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/de83e61c/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java index bab2266..d5779ce 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java @@ -1022,7 +1022,7 @@ public class RFile { * @return map of locality group names to column families. The default locality group will have {@code null} for a name. RFile will only track up to * {@value Writer#MAX_CF_IN_DLG} families for the default locality group. After this it will stop tracking. For the case where the default group has * more thn {@value Writer#MAX_CF_IN_DLG} families an empty list of families is returned. - * @see LocalityGroupUtil#seek(Reader, Range, String, Map) + * @see LocalityGroupUtil#seek(RFile.Reader, Range, String, Map) */ public Map<String,ArrayList<ByteSequence>> getLocalityGroupCF() { Map<String,ArrayList<ByteSequence>> cf = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/de83e61c/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java index f89dbfa..29304c8 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java @@ -44,13 +44,12 @@ public class SiteConfigurationTest { } @Test - public void testOnlySensitivePropertiesExtractedFromCredetialProvider() throws SecurityException, NoSuchMethodException { + public void testOnlySensitivePropertiesExtractedFromCredentialProvider() throws SecurityException, NoSuchMethodException { if (!isCredentialProviderAvailable) { return; } - SiteConfiguration siteCfg = EasyMock.createMockBuilder(SiteConfiguration.class).addMockedMethod("getHadoopConfiguration") - .withConstructor(AccumuloConfiguration.class).withArgs(DefaultConfiguration.getInstance()).createMock(); + SiteConfiguration siteCfg = EasyMock.createMockBuilder(SiteConfiguration.class).addMockedMethod("getHadoopConfiguration").createMock(); siteCfg.set(Property.INSTANCE_SECRET, "ignored"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/de83e61c/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java ---------------------------------------------------------------------- diff --git a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java index 4041164..40f3442 100644 --- a/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java +++ b/shell/src/test/java/org/apache/accumulo/shell/ShellSetInstanceTest.java @@ -56,10 +56,12 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.security.*") @PrepareForTest({Shell.class, ZooUtil.class, ConfigSanityCheck.class}) public class ShellSetInstanceTest { public static class TestOutputStream extends OutputStream {
