diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java index a57777a0a1..077cf3a115 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java @@ -34,10 +34,7 @@ import org.junit.Test; import org.junit.rules.Timeout; -/** - * This test ensures the statuses of EC files with the default policy. - */ -public class TestFileStatusWithDefaultECPolicy { +public class TestFileStatusWithECPolicy { private MiniDFSCluster cluster; private DistributedFileSystem fs; private DFSClient client; @@ -53,7 +50,8 @@ public void before() throws IOException { cluster.waitActive(); fs = cluster.getFileSystem(); client = fs.getClient(); - fs.enableErasureCodingPolicy(getEcPolicy().getName()); + fs.enableErasureCodingPolicy( + StripedFileTestUtil.getDefaultECPolicy().getName()); } @After @@ -64,10 +62,6 @@ public void after() { } } - public ErasureCodingPolicy getEcPolicy() { - return StripedFileTestUtil.getDefaultECPolicy(); - } - @Test public void testFileStatusWithECPolicy() throws Exception { // test directory doesn't have an EC policy @@ -82,7 +76,8 @@ public void testFileStatusWithECPolicy() throws Exception { ContractTestUtils.assertNotErasureCoded(fs, file); fs.delete(file, true); - final ErasureCodingPolicy ecPolicy1 = getEcPolicy(); + final ErasureCodingPolicy ecPolicy1 = + StripedFileTestUtil.getDefaultECPolicy(); // set EC policy on dir fs.setErasureCodingPolicy(dir, ecPolicy1.getName()); ContractTestUtils.assertErasureCoded(fs, dir); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java deleted file mode 100644 index 18902a758f..0000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithRandomECPolicy.java +++ /dev/null @@ -1,49 +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.hdfs; - -import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This test extends TestFileStatusWithDefaultECPolicy to use a random - * (non-default) EC policy. - */ -public class TestFileStatusWithRandomECPolicy extends - TestFileStatusWithDefaultECPolicy { - private static final Logger LOG = LoggerFactory.getLogger( - TestFileStatusWithRandomECPolicy.class); - - private ErasureCodingPolicy ecPolicy; - - public TestFileStatusWithRandomECPolicy() { - // If you want to debug this test with a specific ec policy, please use - // SystemErasureCodingPolicies class. - // e.g. ecPolicy = SystemErasureCodingPolicies.getByID(RS_3_2_POLICY_ID); - ecPolicy = StripedFileTestUtil.getRandomNonDefaultECPolicy(); - LOG.info("run {} with {}.", - TestFileStatusWithRandomECPolicy.class - .getSuperclass().getSimpleName(), ecPolicy.getName()); - } - - @Override - public ErasureCodingPolicy getEcPolicy() { - return ecPolicy; - } -}