Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java Wed Sep 5 04:57:47 2012 @@ -39,7 +39,6 @@ import org.apache.hadoop.security.author import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenInfo; import org.junit.Test; -import org.apache.hadoop.ipc.TestSaslRPC; import org.apache.hadoop.ipc.TestSaslRPC.TestTokenSecretManager; import org.apache.hadoop.ipc.TestSaslRPC.TestTokenIdentifier; import org.apache.hadoop.ipc.TestSaslRPC.TestTokenSelector; @@ -113,6 +112,7 @@ public class TestDoAsEffectiveUser { PROXY_USER_NAME, realUserUgi); UserGroupInformation curUGI = proxyUserUgi .doAs(new PrivilegedExceptionAction<UserGroupInformation>() { + @Override public UserGroupInformation run() throws IOException { return UserGroupInformation.getCurrentUser(); } @@ -131,10 +131,12 @@ public class TestDoAsEffectiveUser { public class TestImpl implements TestProtocol { + @Override public String aMethod() throws IOException { return UserGroupInformation.getCurrentUser().toString(); } + @Override public long getProtocolVersion(String protocol, long clientVersion) throws IOException { return TestProtocol.versionID; @@ -153,8 +155,9 @@ public class TestDoAsEffectiveUser { conf.setStrings(ProxyUsers .getProxySuperuserGroupConfKey(REAL_USER_SHORT_NAME), "group1"); configureSuperUserIPAddresses(conf, REAL_USER_SHORT_NAME); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 5, true, conf, null); + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(5).setVerbose(true).build(); refreshConf(conf); try { @@ -168,6 +171,7 @@ public class TestDoAsEffectiveUser { PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -194,8 +198,9 @@ public class TestDoAsEffectiveUser { configureSuperUserIPAddresses(conf, REAL_USER_SHORT_NAME); conf.setStrings(ProxyUsers.getProxySuperuserGroupConfKey(REAL_USER_SHORT_NAME), "group1"); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 2, false, conf, null); + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(2).setVerbose(false).build(); refreshConf(conf); try { @@ -210,6 +215,7 @@ public class TestDoAsEffectiveUser { .createProxyUserForTesting(PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -240,8 +246,9 @@ public class TestDoAsEffectiveUser { "20.20.20.20"); //Authorized IP address conf.setStrings(ProxyUsers.getProxySuperuserGroupConfKey(REAL_USER_SHORT_NAME), "group1"); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 2, false, conf, null); + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(2).setVerbose(false).build(); refreshConf(conf); @@ -257,6 +264,7 @@ public class TestDoAsEffectiveUser { .createProxyUserForTesting(PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -281,8 +289,9 @@ public class TestDoAsEffectiveUser { final Configuration conf = new Configuration(); conf.setStrings(ProxyUsers .getProxySuperuserGroupConfKey(REAL_USER_SHORT_NAME), "group1"); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 2, false, conf, null); + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(2).setVerbose(false).build(); try { server.start(); @@ -296,6 +305,7 @@ public class TestDoAsEffectiveUser { .createProxyUserForTesting(PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -319,8 +329,9 @@ public class TestDoAsEffectiveUser { public void testRealUserGroupNotSpecified() throws IOException { final Configuration conf = new Configuration(); configureSuperUserIPAddresses(conf, REAL_USER_SHORT_NAME); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 2, false, conf, null); + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(2).setVerbose(false).build(); try { server.start(); @@ -334,6 +345,7 @@ public class TestDoAsEffectiveUser { .createProxyUserForTesting(PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = (TestProtocol) RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -359,9 +371,9 @@ public class TestDoAsEffectiveUser { configureSuperUserIPAddresses(conf, REAL_USER_SHORT_NAME); conf.setStrings(ProxyUsers.getProxySuperuserGroupConfKey(REAL_USER_SHORT_NAME), "group3"); - Server server = RPC.getServer(TestProtocol.class, new TestImpl(), ADDRESS, - 0, 2, false, conf, null); - + Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(2).setVerbose(false).build(); try { server.start(); @@ -375,6 +387,7 @@ public class TestDoAsEffectiveUser { .createProxyUserForTesting(PROXY_USER_NAME, realUserUgi, GROUP_NAMES); String retVal = proxyUserUgi .doAs(new PrivilegedExceptionAction<String>() { + @Override public String run() throws IOException { proxy = RPC.getProxy(TestProtocol.class, TestProtocol.versionID, addr, conf); @@ -406,8 +419,9 @@ public class TestDoAsEffectiveUser { conf .set(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); UserGroupInformation.setConfiguration(conf); - final Server server = RPC.getServer(TestProtocol.class, new TestImpl(), - ADDRESS, 0, 5, true, conf, sm); + final Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class) + .setInstance(new TestImpl()).setBindAddress(ADDRESS).setPort(0) + .setNumHandlers(5).setVerbose(true).setSecretManager(sm).build(); server.start(); @@ -460,8 +474,10 @@ public class TestDoAsEffectiveUser { newConf.set(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); UserGroupInformation.setConfiguration(newConf); - final Server server = RPC.getServer(TestProtocol.class, new TestImpl(), - ADDRESS, 0, 5, true, newConf, sm); + final Server server = new RPC.Builder(newConf) + .setProtocol(TestProtocol.class).setInstance(new TestImpl()) + .setBindAddress(ADDRESS).setPort(0).setNumHandlers(5).setVerbose(true) + .setSecretManager(sm).build(); server.start();
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupsCaching.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupsCaching.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupsCaching.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestGroupsCaching.java Wed Sep 5 04:57:47 2012 @@ -54,6 +54,7 @@ public class TestGroupsCaching { private static Set<String> allGroups = new HashSet<String>(); private static Set<String> blackList = new HashSet<String>(); + @Override public List<String> getGroups(String user) throws IOException { LOG.info("Getting groups for " + user); if (blackList.contains(user)) { @@ -62,6 +63,7 @@ public class TestGroupsCaching { return new LinkedList<String>(allGroups); } + @Override public void cacheGroupsRefresh() throws IOException { LOG.info("Cache is being refreshed."); clearBlackList(); @@ -73,6 +75,7 @@ public class TestGroupsCaching { blackList.clear(); } + @Override public void cacheGroupsAdd(List<String> groups) throws IOException { LOG.info("Adding " + groups + " to groups."); allGroups.addAll(groups); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestJNIGroupsMapping.java Wed Sep 5 04:57:47 2012 @@ -21,16 +21,11 @@ import static org.junit.Assert.*; import java.util.Arrays; import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.security.GroupMappingServiceProvider; import org.apache.hadoop.security.JniBasedUnixGroupsMapping; import org.apache.hadoop.security.ShellBasedUnixGroupsMapping; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.util.NativeCodeLoader; -import org.apache.hadoop.util.ReflectionUtils; import org.junit.Before; import org.junit.Test; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java Wed Sep 5 04:57:47 2012 @@ -92,6 +92,7 @@ public class TestUserGroupInformation { UserGroupInformation.createUserForTesting(USER_NAME, GROUP_NAMES); UserGroupInformation curUGI = userGroupInfo.doAs(new PrivilegedExceptionAction<UserGroupInformation>(){ + @Override public UserGroupInformation run() throws IOException { return UserGroupInformation.getCurrentUser(); }}); @@ -249,6 +250,70 @@ public class TestUserGroupInformation { ugi.addToken(t1); checkTokens(ugi, t1, t2, t3); } + + @SuppressWarnings("unchecked") // from Mockito mocks + @Test + public <T extends TokenIdentifier> void testGetCreds() throws Exception { + UserGroupInformation ugi = + UserGroupInformation.createRemoteUser("someone"); + + Text service = new Text("service"); + Token<T> t1 = mock(Token.class); + when(t1.getService()).thenReturn(service); + Token<T> t2 = mock(Token.class); + when(t2.getService()).thenReturn(new Text("service2")); + Token<T> t3 = mock(Token.class); + when(t3.getService()).thenReturn(service); + + // add token to ugi + ugi.addToken(t1); + ugi.addToken(t2); + checkTokens(ugi, t1, t2); + + Credentials creds = ugi.getCredentials(); + creds.addToken(t3.getService(), t3); + assertSame(t3, creds.getToken(service)); + // check that ugi wasn't modified + checkTokens(ugi, t1, t2); + } + + @SuppressWarnings("unchecked") // from Mockito mocks + @Test + public <T extends TokenIdentifier> void testAddCreds() throws Exception { + UserGroupInformation ugi = + UserGroupInformation.createRemoteUser("someone"); + + Text service = new Text("service"); + Token<T> t1 = mock(Token.class); + when(t1.getService()).thenReturn(service); + Token<T> t2 = mock(Token.class); + when(t2.getService()).thenReturn(new Text("service2")); + byte[] secret = new byte[]{}; + Text secretKey = new Text("sshhh"); + + // fill credentials + Credentials creds = new Credentials(); + creds.addToken(t1.getService(), t1); + creds.addToken(t2.getService(), t2); + creds.addSecretKey(secretKey, secret); + + // add creds to ugi, and check ugi + ugi.addCredentials(creds); + checkTokens(ugi, t1, t2); + assertSame(secret, ugi.getCredentials().getSecretKey(secretKey)); + } + + @SuppressWarnings("unchecked") // from Mockito mocks + @Test + public <T extends TokenIdentifier> void testGetCredsNotSame() + throws Exception { + UserGroupInformation ugi = + UserGroupInformation.createRemoteUser("someone"); + Credentials creds = ugi.getCredentials(); + // should always get a new copy + assertNotSame(creds, ugi.getCredentials()); + } + private void checkTokens(UserGroupInformation ugi, Token<?> ... tokens) { // check the ugi's token collection @@ -298,13 +363,22 @@ public class TestUserGroupInformation { Token<T> t2 = mock(Token.class); when(t2.getService()).thenReturn(new Text("t2")); + Credentials creds = new Credentials(); + byte[] secretKey = new byte[]{}; + Text secretName = new Text("shhh"); + creds.addSecretKey(secretName, secretKey); + ugi.addToken(t1); ugi.addToken(t2); + ugi.addCredentials(creds); Collection<Token<? extends TokenIdentifier>> z = ugi.getTokens(); assertTrue(z.contains(t1)); assertTrue(z.contains(t2)); assertEquals(2, z.size()); + Credentials ugiCreds = ugi.getCredentials(); + assertSame(secretKey, ugiCreds.getSecretKey(secretName)); + assertEquals(1, ugiCreds.numberOfSecretKeys()); try { z.remove(t1); @@ -316,6 +390,7 @@ public class TestUserGroupInformation { // ensure that the tokens are passed through doAs Collection<Token<? extends TokenIdentifier>> otherSet = ugi.doAs(new PrivilegedExceptionAction<Collection<Token<?>>>(){ + @Override public Collection<Token<?>> run() throws IOException { return UserGroupInformation.getCurrentUser().getTokens(); } @@ -342,6 +417,7 @@ public class TestUserGroupInformation { // ensure that the token identifiers are passed through doAs Collection<TokenIdentifier> otherSet = ugi .doAs(new PrivilegedExceptionAction<Collection<TokenIdentifier>>() { + @Override public Collection<TokenIdentifier> run() throws IOException { return UserGroupInformation.getCurrentUser().getTokenIdentifiers(); } @@ -358,6 +434,7 @@ public class TestUserGroupInformation { ugi.setAuthenticationMethod(am); Assert.assertEquals(am, ugi.getAuthenticationMethod()); ugi.doAs(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws IOException { Assert.assertEquals(am, UserGroupInformation.getCurrentUser() .getAuthenticationMethod()); @@ -379,6 +456,7 @@ public class TestUserGroupInformation { Assert.assertEquals(am, UserGroupInformation .getRealAuthenticationMethod(proxyUgi)); proxyUgi.doAs(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws IOException { Assert.assertEquals(AuthenticationMethod.PROXY, UserGroupInformation .getCurrentUser().getAuthenticationMethod()); @@ -451,6 +529,7 @@ public class TestUserGroupInformation { public void testUGIUnderNonHadoopContext() throws Exception { Subject nonHadoopSubject = new Subject(); Subject.doAs(nonHadoopSubject, new PrivilegedExceptionAction<Void>() { + @Override public Void run() throws IOException { UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); assertNotNull(ugi); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/authorize/TestAccessControlList.java Wed Sep 5 04:57:47 2012 @@ -22,13 +22,10 @@ import java.util.Set; import java.util.List; import org.junit.Test; -import org.junit.Before; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/TestToken.java Wed Sep 5 04:57:47 2012 @@ -18,8 +18,6 @@ package org.apache.hadoop.security.token; -import static junit.framework.Assert.assertEquals; - import java.io.*; import java.util.Arrays; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java Wed Sep 5 04:57:47 2012 @@ -19,7 +19,6 @@ package org.apache.hadoop.security.token.delegation; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutput; @@ -47,7 +46,6 @@ import org.apache.hadoop.security.token. import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager.DelegationTokenInformation; import org.apache.hadoop.util.Daemon; -import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Time; import org.junit.Test; @@ -73,9 +71,11 @@ public class TestDelegationToken { return KIND; } + @Override public void write(DataOutput out) throws IOException { super.write(out); } + @Override public void readFields(DataInput in) throws IOException { super.readFields(in); } @@ -231,6 +231,7 @@ public class TestDelegationToken { dtSecretManager, "SomeUser", "JobTracker"); // Fake renewer should not be able to renew shouldThrow(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { dtSecretManager.renewToken(token, "FakeRenewer"); return null; @@ -259,6 +260,7 @@ public class TestDelegationToken { Thread.sleep(2000); shouldThrow(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { dtSecretManager.renewToken(token, "JobTracker"); return null; @@ -280,6 +282,7 @@ public class TestDelegationToken { generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker"); //Fake renewer should not be able to renew shouldThrow(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { dtSecretManager.renewToken(token, "FakeCanceller"); return null; @@ -287,6 +290,7 @@ public class TestDelegationToken { }, AccessControlException.class); dtSecretManager.cancelToken(token, "JobTracker"); shouldThrow(new PrivilegedExceptionAction<Object>() { + @Override public Object run() throws Exception { dtSecretManager.renewToken(token, "JobTracker"); return null; @@ -379,6 +383,7 @@ public class TestDelegationToken { final int numTokensPerThread = 100; class tokenIssuerThread implements Runnable { + @Override public void run() { for(int i =0;i <numTokensPerThread; i++) { generateDelegationToken(dtSecretManager, "auser", "arenewer"); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java Wed Sep 5 04:57:47 2012 @@ -171,6 +171,7 @@ public abstract class GenericTestUtils { waitLatch.countDown(); } + @Override public Object answer(InvocationOnMock invocation) throws Throwable { LOG.info("DelayAnswer firing fireLatch"); fireLatch.countDown(); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java Wed Sep 5 04:57:47 2012 @@ -45,7 +45,6 @@ import org.apache.hadoop.metrics2.lib.Mu import org.apache.hadoop.metrics2.util.Quantile; import static org.apache.hadoop.metrics2.lib.Interns.*; -import static org.apache.hadoop.test.MetricsAsserts.eqName; /** * Helpers for metrics source tests Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java Wed Sep 5 04:57:47 2012 @@ -183,6 +183,7 @@ public abstract class MultithreadedTestU this.ctx = ctx; } + @Override public void run() { try { doWork(); @@ -215,6 +216,7 @@ public abstract class MultithreadedTestU * Repeats a given user action until the context is asked to stop * or meets an error. */ + @Override public final void doWork() throws Exception { while (ctx.shouldRun() && !stopped) { doAnAction(); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/JarFinder.java Wed Sep 5 04:57:47 2012 @@ -21,7 +21,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.net.URL; import java.net.URLDecoder; import java.text.MessageFormat; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java Wed Sep 5 04:57:47 2012 @@ -23,7 +23,6 @@ import java.util.Random; import junit.framework.TestCase; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.io.Text; @@ -208,12 +207,14 @@ public class TestIndexedSort extends Tes return seed; } + @Override public int compare(int i, int j) { // assume positive return values[valindirect[valindex[i]]] - values[valindirect[valindex[j]]]; } + @Override public void swap(int i, int j) { int tmp = valindex[i]; valindex[i] = valindex[j]; @@ -261,12 +262,14 @@ public class TestIndexedSort extends Tes public int getCmp() { return comparisions; } public int getSwp() { return swaps; } + @Override public int compare(int i, int j) { assertTrue("Expected fewer than " + maxcmp + " comparisons", ++comparisions < maxcmp); return s.compare(i, j); } + @Override public void swap(int i, int j) { assertTrue("Expected fewer than " + maxswp + " swaps", ++swaps < maxswp); @@ -323,6 +326,7 @@ public class TestIndexedSort extends Tes t.set(sb.toString()); } + @Override public int compare(int i, int j) { final int ii = indices[i]; final int ij = indices[j]; @@ -332,6 +336,7 @@ public class TestIndexedSort extends Tes ((ij + 1 == indices.length) ? eob : offsets[ij + 1]) - offsets[ij]); } + @Override public void swap(int i, int j) { int tmp = indices[i]; indices[i] = indices[j]; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java Wed Sep 5 04:57:47 2012 @@ -18,7 +18,6 @@ package org.apache.hadoop.util; -import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java Wed Sep 5 04:57:47 2012 @@ -156,7 +156,7 @@ public class TestPureJavaCrc32 { return s; } - /** {@inheritDoc} */ + @Override public String toString() { final StringBuilder b = new StringBuilder(); for(String s : toStrings(String.format("T%d_", Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java Wed Sep 5 04:57:47 2012 @@ -22,8 +22,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.HashMap; -import org.apache.hadoop.conf.Configuration; - import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; @@ -64,6 +62,7 @@ public class TestReflectionUtils { Thread[] th = new Thread[32]; for (int i=0; i<th.length; i++) { th[i] = new Thread() { + @Override public void run() { try { doTestCache(); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java Wed Sep 5 04:57:47 2012 @@ -35,6 +35,7 @@ public class TestRunJar extends TestCase private static final String TEST_JAR_NAME="test-runjar.jar"; + @Override @Before protected void setUp() throws Exception { @@ -48,6 +49,7 @@ public class TestRunJar extends TestCase makeTestJar(); } + @Override @After protected void tearDown() { FileUtil.fullyDelete(TEST_ROOT_DIR); Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java?rev=1380990&r1=1380989&r2=1380990&view=diff ============================================================================== --- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java (original) +++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java Wed Sep 5 04:57:47 2012 @@ -27,7 +27,6 @@ import java.io.PrintWriter; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; -import java.util.Timer; public class TestShell extends TestCase { @@ -38,10 +37,12 @@ public class TestShell extends TestCase super(interval); } + @Override protected String[] getExecString() { return new String[] {"echo", "hello"}; } + @Override protected void parseExecResult(BufferedReader lines) throws IOException { ++runCount; }
