unit fixes

apache · Aug 23, 2019 · 3adcd41 · 3adcd41
1 parent a31efcb
commit 3adcd41
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 89 deletions.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/rest/headers/Header.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/rest/headers/Header.java
diff --git a/...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/...op-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -66,7 +66,6 @@
 import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_HEARTBEAT_INTERVAL;
 import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeState
     .HEALTHY;
-import static org.apache.hadoop.ozone.OzoneConfigKeys.HDDS_DATANODE_PLUGINS_KEY;
 import static org.apache.hadoop.ozone.OzoneConfigKeys
     .DFS_CONTAINER_IPC_PORT;
 import static org.apache.hadoop.ozone.OzoneConfigKeys
@@ -358,7 +357,7 @@ public void startScm() throws IOException {
   public void startHddsDatanodes() {
     hddsDatanodes.forEach((datanode) -> {
       datanode.setCertificateClient(getCAClient());
-      dnatanode.start();
+      datanode.start();
     });
   }
 

diff --git a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/TestOzoneClientProducer.java
@@ -17,31 +17,30 @@
  */
 package org.apache.hadoop.ozone.s3;
 
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.apache.hadoop.test.LambdaTestUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.Mockito;
-
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
-
 import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.OzoneConfigKeys;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.test.LambdaTestUtils;
+
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.AUTHORIZATION_HEADER;
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.CONTENT_MD5;
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.CONTENT_TYPE;
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.HOST_HEADER;
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.X_AMAZ_DATE;
 import static org.apache.hadoop.ozone.s3.AWSAuthParser.X_AMZ_CONTENT_SHA256;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
 
 /**
  * Test class for @{@link OzoneClientProducer}.
@@ -87,8 +86,8 @@ public TestOzoneClientProducer(String authHeader, String contentMd5,
 
   @Test
   public void testGetClientFailure() throws Exception {
-    LambdaTestUtils.intercept(IOException.class, "Couldn't create" +
-        " protocol ", () -> producer.createClient());
+    LambdaTestUtils.intercept(IOException.class, "Couldn't create", 
+            () -> producer.createClient());
   }
 
   private void setupContext() throws Exception {
@@ -143,4 +142,4 @@ public static Collection<Object[]> data() {
     });
   }
 
-}
+}