Author: szetszwo
Date: Tue Jun 2 18:46:47 2009
New Revision: 781118
URL: http://svn.apache.org/viewvc?rev=781118&view=rev
Log:
HADOOP-5954. Fix javac warnings in TestFileCreation, TestSmallBlock,
TestFileStatus, TestDFSShellGenericOptions, TestSeekBug and
TestDFSStartupVersions.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Jun 2 18:46:47 2009
@@ -753,6 +753,10 @@
HADOOP-5953. The isDirectory(..) and isFile(..) methods in KosmosFileSystem
should not be deprecated. (szetszwo)
+ HADOOP-5954. Fix javac warnings in TestFileCreation, TestSmallBlock,
+ TestFileStatus, TestDFSShellGenericOptions, TestSeekBug and
+ TestDFSStartupVersions. (szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
(original)
+++
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
Tue Jun 2 18:46:47 2009
@@ -29,7 +29,6 @@
import org.apache.hadoop.fs.FsShell;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
-import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.util.ToolRunner;
public class TestDFSShellGenericOptions extends TestCase {
@@ -101,8 +100,8 @@
FileSystem fs=null;
try {
ToolRunner.run(shell, args);
- fs = new DistributedFileSystem(NameNode.getAddress(namenode),
- shell.getConf());
+ fs = FileSystem.get(NameNode.getUri(NameNode.getAddress(namenode)),
+ shell.getConf());
assertTrue("Directory does not get created",
fs.isDirectory(new Path("/data")));
fs.delete(new Path("/data"), true);
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
(original)
+++
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
Tue Jun 2 18:46:47 2009
@@ -17,22 +17,21 @@
*/
package org.apache.hadoop.hdfs;
+import static
org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.DATA_NODE;
+import static
org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.NAME_NODE;
+
import java.io.File;
+
import junit.framework.TestCase;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
-
-import static
org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.NAME_NODE;
-import static
org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType.DATA_NODE;
-
-import org.apache.hadoop.hdfs.server.common.HdfsConstants;
import org.apache.hadoop.hdfs.server.common.Storage;
import org.apache.hadoop.hdfs.server.common.StorageInfo;
-import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
/**
* This test ensures the appropriate response (successful or failure) from
@@ -42,8 +41,6 @@
private static final Log LOG = LogFactory.getLog(
"org.apache.hadoop.hdfs.TestDFSStartupVersions");
- private static Path TEST_ROOT_DIR = new Path(
-
System.getProperty("test.build.data","/tmp").toString().replace(' ', '+'));
private MiniDFSCluster cluster = null;
/**
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
---
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java
(original)
+++
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java
Tue Jun 2 18:46:47 2009
@@ -34,7 +34,6 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.fs.permission.PermissionStatus;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
import org.apache.hadoop.hdfs.protocol.FSConstants;
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java
(original)
+++ hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java
Tue Jun 2 18:46:47 2009
@@ -35,10 +35,6 @@
static final int blockSize = 8192;
static final int fileSize = 16384;
- private static String TEST_ROOT_DIR =
- new Path(System.getProperty("test.build.data","/tmp"))
- .toString().replace(' ', '+');
-
private void writeFile(FileSystem fileSys, Path name, int repl,
int fileSize, int blockSize)
throws IOException {
@@ -99,7 +95,6 @@
// create an empty directory
//
- Path parentDir = new Path("/test");
Path dir = new Path("/test/mkdirs");
assertTrue(fs.mkdirs(dir));
assertTrue(fs.exists(dir));
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java
(original)
+++ hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java Tue
Jun 2 18:46:47 2009
@@ -49,7 +49,7 @@
private void checkAndEraseData(byte[] actual, int from, byte[] expected,
String message) {
for (int idx = 0; idx < actual.length; idx++) {
- this.assertEquals(message+" byte "+(from+idx)+" differs. expected "+
+ assertEquals(message+" byte "+(from+idx)+" differs. expected "+
expected[from+idx]+" actual "+actual[idx],
actual[idx], expected[from+idx]);
actual[idx] = 0;
Modified:
hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java?rev=781118&r1=781117&r2=781118&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java
(original)
+++ hadoop/core/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java
Tue Jun 2 18:46:47 2009
@@ -52,7 +52,7 @@
private void checkAndEraseData(byte[] actual, int from, byte[] expected,
String message) {
for (int idx = 0; idx < actual.length; idx++) {
- this.assertEquals(message+" byte "+(from+idx)+" differs. expected "+
+ assertEquals(message+" byte "+(from+idx)+" differs. expected "+
expected[from+idx]+" actual "+actual[idx],
actual[idx], expected[from+idx]);
actual[idx] = 0;
