HADOOP-17628. ITestS3AContractDistCp tweaks

Change-Id: I464f2071db2a0b17ac7589ea0ccb9b671d065c65

Author: steveloughran

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/ITestS3AContractDistCp.java

@@ -18,18 +18,15 @@
 
 package org.apache.hadoop.fs.contract.s3a;
 
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.StorageStatistics;
-import org.apache.hadoop.tools.contract.AbstractContractDistCpTest;
-
 import static org.apache.hadoop.fs.contract.ContractTestUtils.skip;
-import static org.apache.hadoop.fs.s3a.Constants.FAST_UPLOAD_BUFFER;
-import static org.apache.hadoop.fs.s3a.Constants.FAST_UPLOAD_BUFFER_DISK;
-import static org.apache.hadoop.fs.s3a.Constants.MULTIPART_MIN_SIZE;
-import static org.apache.hadoop.fs.s3a.Constants.MULTIPART_SIZE;
+import static org.apache.hadoop.fs.s3a.Constants.*;
 import static org.apache.hadoop.fs.s3a.S3ATestConstants.SCALE_TEST_TIMEOUT_MILLIS;
 import static org.apache.hadoop.fs.s3a.S3ATestUtils.maybeEnableS3Guard;
 
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.StorageStatistics;
+import org.apache.hadoop.tools.contract.AbstractContractDistCpTest;
+
 /**
  * Contract test suite covering S3A integration with DistCp.
  * Uses the block output stream, buffered to disk. This is the
@@ -72,8 +69,9 @@ protected S3AContract createContract(Configuration conf) {
   public void testDistCpWithIterator() throws Exception {
     final long renames = getRenameOperationCount();
     super.testDistCpWithIterator();
-    assertEquals("Expected no renames for a direct write distcp", 0L,
-        getRenameOperationCount() - renames);
+    assertEquals("Expected no renames for a direct write distcp",
+        getRenameOperationCount(),
+         renames);
   }
 
   @Override