HDDS-500. TestErrorCode.java has wrong package name. Contributed by Anu Engineer.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ff00f55 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ff00f55 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ff00f55 Branch: refs/heads/YARN-7402 Commit: 7ff00f558713f2f0755193b7d57ebdad8d8f349a Parents: f176e8a3 Author: Arpit Agarwal <[email protected]> Authored: Tue Sep 18 15:52:00 2018 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Tue Sep 18 15:52:00 2018 -0700 ---------------------------------------------------------------------- .../hadoop/ozone/web/client/TestKeys.java | 1 + .../org/apache/hadoop/ozone/TestErrorCode.java | 53 -------------------- .../apache/hadoop/ozone/web/TestErrorCode.java | 53 ++++++++++++++++++++ 3 files changed, 54 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ff00f55/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java index 21887be..6377f11 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/web/client/TestKeys.java @@ -328,6 +328,7 @@ public class TestKeys { cluster.restartHddsDatanode(datanodeIdx); } + @Ignore("Causes a JVm exit") @Test public void testPutAndGetKeyWithDnRestart() throws Exception { runTestPutAndGetKeyWithDnRestart( http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ff00f55/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/TestErrorCode.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/TestErrorCode.java b/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/TestErrorCode.java deleted file mode 100644 index abb61bb..0000000 --- a/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/TestErrorCode.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.ozone.web; - -import org.apache.hadoop.ozone.web.exceptions.ErrorTable; -import org.apache.hadoop.ozone.client.rest.OzoneException; -import org.junit.Test; - -import static junit.framework.TestCase.assertEquals; -import static org.apache.hadoop.ozone.web.utils.OzoneUtils.getRequestID; - -/** - * Test Ozone Error Codes. - */ -public class TestErrorCode { - /** - * Test Error Generator functions. - */ - @Test - public void testErrorGen() { - OzoneException e = ErrorTable - .newError(ErrorTable.ACCESS_DENIED, getRequestID(), "/test/path", - "localhost"); - assertEquals(e.getHostID(), "localhost"); - assertEquals(e.getShortMessage(), - ErrorTable.ACCESS_DENIED.getShortMessage()); - } - - @Test - public void testErrorGenWithException() { - OzoneException e = - new OzoneException(ErrorTable.ACCESS_DENIED.getHttpCode(), - "short message", new Exception("Hello")); - assertEquals("short message", e.getShortMessage()); - assertEquals("Hello", e.getMessage()); - } -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ff00f55/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/web/TestErrorCode.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/web/TestErrorCode.java b/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/web/TestErrorCode.java new file mode 100644 index 0000000..abb61bb --- /dev/null +++ b/hadoop-ozone/objectstore-service/src/test/java/org/apache/hadoop/ozone/web/TestErrorCode.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.web; + +import org.apache.hadoop.ozone.web.exceptions.ErrorTable; +import org.apache.hadoop.ozone.client.rest.OzoneException; +import org.junit.Test; + +import static junit.framework.TestCase.assertEquals; +import static org.apache.hadoop.ozone.web.utils.OzoneUtils.getRequestID; + +/** + * Test Ozone Error Codes. + */ +public class TestErrorCode { + /** + * Test Error Generator functions. + */ + @Test + public void testErrorGen() { + OzoneException e = ErrorTable + .newError(ErrorTable.ACCESS_DENIED, getRequestID(), "/test/path", + "localhost"); + assertEquals(e.getHostID(), "localhost"); + assertEquals(e.getShortMessage(), + ErrorTable.ACCESS_DENIED.getShortMessage()); + } + + @Test + public void testErrorGenWithException() { + OzoneException e = + new OzoneException(ErrorTable.ACCESS_DENIED.getHttpCode(), + "short message", new Exception("Hello")); + assertEquals("short message", e.getShortMessage()); + assertEquals("Hello", e.getMessage()); + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
