You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2011/12/29 02:54:35 UTC
svn commit: r1225411 - in /hadoop/common/branches/branch-1: CHANGES.txt
src/test/org/apache/hadoop/fs/TestFileSystem.java
src/test/org/apache/hadoop/security/TestJobCredentials.java
src/test/org/apache/hadoop/security/TestUserGroupInformation.java
Author: jitendra
Date: Thu Dec 29 01:54:34 2011
New Revision: 1225411
URL: http://svn.apache.org/viewvc?rev=1225411&view=rev
Log:
HADOOP-7942. Enabling clover coverage reports fails hadoop unit test compilation.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/TestFileSystem.java
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestJobCredentials.java
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1225411&r1=1225410&r2=1225411&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Dec 29 01:54:34 2011
@@ -73,6 +73,9 @@ Release 1.1.0 - unreleased
HDFS-2702. A single failed name dir can cause the NN to exit. (eli)
+ HADOOP-7942. enabling clover coverage reports fails hadoop unit test
+ compilation. (jitendra)
+
IMPROVEMENTS
MAPREDUCE-2517. Add system tests to Gridmix. (Vinay Thota via amarrk)
Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/TestFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/TestFileSystem.java?rev=1225411&r1=1225410&r2=1225411&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/TestFileSystem.java (original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/TestFileSystem.java Thu Dec 29 01:54:34 2011
@@ -623,7 +623,7 @@ public class TestFileSystem extends Test
}
@SuppressWarnings("unchecked")
- public <T extends TokenIdentifier> void testCacheForUgi() throws Exception {
+ public void testCacheForUgi() throws Exception {
final Configuration conf = new Configuration();
conf.set("fs.cachedfile.impl", conf.get("fs.file.impl"));
UserGroupInformation ugiA = UserGroupInformation.createRemoteUser("foo");
@@ -650,7 +650,7 @@ public class TestFileSystem extends Test
//corresponding to the two UGIs
assertNotSame(fsA, fsB);
- Token<T> t1 = mock(Token.class);
+ Token<? extends TokenIdentifier> t1 = mock(Token.class);
UserGroupInformation ugiA2 = UserGroupInformation.createRemoteUser("foo");
fsA = ugiA2.doAs(new PrivilegedExceptionAction<FileSystem>() {
Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestJobCredentials.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestJobCredentials.java?rev=1225411&r1=1225410&r2=1225411&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestJobCredentials.java (original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestJobCredentials.java Thu Dec 29 01:54:34 2011
@@ -59,13 +59,13 @@ public class TestJobCredentials {
@SuppressWarnings("unchecked")
@Test
- public <T extends TokenIdentifier> void testReadWriteStorage()
+ public void testReadWriteStorage()
throws IOException, NoSuchAlgorithmException{
// create tokenStorage Object
Credentials ts = new Credentials();
- Token<T> token1 = new Token();
- Token<T> token2 = new Token();
+ Token<? extends TokenIdentifier> token1 = new Token();
+ Token<? extends TokenIdentifier> token2 = new Token();
Text service1 = new Text("service1");
Text service2 = new Text("service2");
Collection<Text> services = new ArrayList<Text>();
Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java?rev=1225411&r1=1225410&r2=1225411&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java (original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Thu Dec 29 01:54:34 2011
@@ -217,12 +217,12 @@ public class TestUserGroupInformation {
@SuppressWarnings("unchecked") // from Mockito mocks
@Test
- public <T extends TokenIdentifier> void testUGITokens() throws Exception {
+ public void testUGITokens() throws Exception {
UserGroupInformation ugi =
UserGroupInformation.createUserForTesting("TheDoctor",
new String [] { "TheTARDIS"});
- Token<T> t1 = mock(Token.class);
- Token<T> t2 = mock(Token.class);
+ Token<? extends TokenIdentifier> t1 = mock(Token.class);
+ Token<? extends TokenIdentifier> t2 = mock(Token.class);
ugi.addToken(t1);
ugi.addToken(t2);