This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new d5b03b086f HDDS-9994. Add static import for assertions and mocks in
remaining hdds modules (#5990)
d5b03b086f is described below
commit d5b03b086fcb2ee784defe341fb8cfa488d0f348
Author: Raju Balpande <[email protected]>
AuthorDate: Fri Jan 12 15:20:57 2024 +0530
HDDS-9994. Add static import for assertions and mocks in remaining hdds
modules (#5990)
---
.../rawcoder/TestCodecRawCoderMapping.java | 19 +++---
.../erasurecode/rawcoder/TestDummyRawCoder.java | 7 ++-
.../erasurecode/rawcoder/TestRawCoderBase.java | 21 ++++---
.../hadoop/hdds/utils/TestNativeLibraryLoader.java | 21 ++++---
.../db/managed/TestManagedSSTDumpIterator.java | 36 ++++++-----
.../compaction/log/TestCompactionFileInfo.java | 7 ++-
.../ozone/rocksdb/util/TestSstFileSetReader.java | 20 +++---
.../rocksdiff/TestRocksDBCheckpointDiffer.java | 32 +++++-----
.../TestReplicationManagerScenarios.java | 28 +++++----
.../hdds/scm/cli/container/TestInfoSubCommand.java | 62 +++++++++----------
.../scm/cli/container/TestReportSubCommand.java | 11 ++--
.../cli/container/upgrade/TestUpgradeManager.java | 11 ++--
.../datanode/TestContainerBalancerSubCommand.java | 12 ++--
.../datanode/TestDecommissionStatusSubCommand.java | 14 ++---
.../cli/datanode/TestDecommissionSubCommand.java | 6 +-
.../scm/cli/datanode/TestListInfoSubcommand.java | 8 +--
.../cli/datanode/TestMaintenanceSubCommand.java | 6 +-
.../cli/datanode/TestRecommissionSubCommand.java | 6 +-
.../scm/cli/datanode/TestUsageInfoSubcommand.java | 71 +++++++++++-----------
.../cli/pipeline/TestListPipelinesSubCommand.java | 57 +++++++----------
20 files changed, 221 insertions(+), 234 deletions(-)
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestCodecRawCoderMapping.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestCodecRawCoderMapping.java
index 6c26a2d166..b190396589 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestCodecRawCoderMapping.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestCodecRawCoderMapping.java
@@ -19,9 +19,10 @@ package org.apache.ozone.erasurecode.rawcoder;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.ozone.erasurecode.rawcoder.util.CodecUtil;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
/**
* Test the codec to raw coder mapping.
*/
@@ -40,11 +41,11 @@ public class TestCodecRawCoderMapping {
RawErasureDecoder decoder =
CodecUtil.createRawDecoderWithFallback(coderOptions);
if (ErasureCodeNative.isNativeCodeLoaded()) {
- Assertions.assertTrue(encoder instanceof NativeRSRawEncoder);
- Assertions.assertTrue(decoder instanceof NativeRSRawDecoder);
+ assertInstanceOf(NativeRSRawEncoder.class, encoder);
+ assertInstanceOf(NativeRSRawDecoder.class, decoder);
} else {
- Assertions.assertTrue(encoder instanceof RSRawEncoder);
- Assertions.assertTrue(decoder instanceof RSRawDecoder);
+ assertInstanceOf(RSRawEncoder.class, encoder);
+ assertInstanceOf(RSRawDecoder.class, decoder);
}
}
@@ -58,11 +59,11 @@ public class TestCodecRawCoderMapping {
RawErasureDecoder decoder =
CodecUtil.createRawDecoderWithFallback(coderOptions);
if (ErasureCodeNative.isNativeCodeLoaded()) {
- Assertions.assertTrue(encoder instanceof NativeXORRawEncoder);
- Assertions.assertTrue(decoder instanceof NativeXORRawDecoder);
+ assertInstanceOf(NativeXORRawEncoder.class, encoder);
+ assertInstanceOf(NativeXORRawDecoder.class, decoder);
} else {
- Assertions.assertTrue(encoder instanceof XORRawEncoder);
- Assertions.assertTrue(decoder instanceof XORRawDecoder);
+ assertInstanceOf(XORRawEncoder.class, encoder);
+ assertInstanceOf(XORRawDecoder.class, decoder);
}
}
}
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
index c96beb7ca0..b27210e573 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestDummyRawCoder.java
@@ -18,13 +18,14 @@
package org.apache.ozone.erasurecode.rawcoder;
import org.apache.ozone.erasurecode.ECChunk;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.ByteBuffer;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* Test dummy raw coder.
*/
@@ -66,7 +67,7 @@ public class TestDummyRawCoder extends TestRawCoderBase {
try {
encode(dataChunks, parityChunks);
} catch (IOException e) {
- Assertions.fail("Unexpected IOException: " + e.getMessage());
+ fail("Unexpected IOException: " + e.getMessage());
}
compareAndVerify(parityChunks, getEmptyChunks(parityChunks.length));
@@ -81,7 +82,7 @@ public class TestDummyRawCoder extends TestRawCoderBase {
decode(inputChunks, getErasedIndexesForDecoding(),
recoveredChunks);
} catch (IOException e) {
- Assertions.fail("Unexpected IOException: " + e.getMessage());
+ fail("Unexpected IOException: " + e.getMessage());
}
compareAndVerify(recoveredChunks, getEmptyChunks(recoveredChunks.length));
}
diff --git
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
index 1e8b11cd34..1f8cff4338 100644
---
a/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
+++
b/hadoop-hdds/erasurecode/src/test/java/org/apache/ozone/erasurecode/rawcoder/TestRawCoderBase.java
@@ -20,13 +20,14 @@ package org.apache.ozone.erasurecode.rawcoder;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.ozone.erasurecode.ECChunk;
import org.apache.ozone.erasurecode.TestCoderBase;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.io.IOException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Raw coder test base with utilities.
@@ -95,7 +96,7 @@ public abstract class TestRawCoderBase extends TestCoderBase {
try {
performTestCoding(baseChunkSize, false, true, false);
- Assertions.fail("Encoding test with bad input should fail");
+ fail("Encoding test with bad input should fail");
} catch (Exception e) {
// Expected
}
@@ -111,7 +112,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
try {
performTestCoding(baseChunkSize, false, false, true);
- Assertions.fail("Decoding test with bad output should fail");
+ fail("Decoding test with bad output should fail");
} catch (Exception e) {
// Expected
}
@@ -144,14 +145,14 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
public void testCodingWithErasingTooMany() {
try {
testCoding(true);
- Assertions.fail("Decoding test erasing too many should fail");
+ fail("Decoding test erasing too many should fail");
} catch (Exception e) {
// Expected
}
try {
testCoding(false);
- Assertions.fail("Decoding test erasing too many should fail");
+ fail("Decoding test erasing too many should fail");
} catch (Exception e) {
// Expected
}
@@ -191,7 +192,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
try {
encoder.encode(dataChunks, parityChunks);
} catch (IOException e) {
- Assertions.fail("Should not get IOException: " + e.getMessage());
+ fail("Should not get IOException: " + e.getMessage());
}
dumpChunks("Encoded parity chunks", parityChunks);
@@ -228,7 +229,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
decoder.decode(inputChunks, getErasedIndexesForDecoding(),
recoveredChunks);
} catch (IOException e) {
- Assertions.fail("Should not get IOException: " + e.getMessage());
+ fail("Should not get IOException: " + e.getMessage());
}
dumpChunks("Decoded/recovered chunks", recoveredChunks);
@@ -318,7 +319,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
try {
encoder.encode(dataChunks, parityChunks);
} catch (IOException e) {
- Assertions.fail("Should not get IOException: " + e.getMessage());
+ fail("Should not get IOException: " + e.getMessage());
}
verifyBufferPositionAtEnd(dataChunks);
@@ -332,7 +333,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
decoder.decode(inputChunks, getErasedIndexesForDecoding(),
recoveredChunks);
} catch (IOException e) {
- Assertions.fail("Should not get IOException: " + e.getMessage());
+ fail("Should not get IOException: " + e.getMessage());
}
verifyBufferPositionAtEnd(inputChunks);
}
@@ -340,7 +341,7 @@ public abstract class TestRawCoderBase extends
TestCoderBase {
private void verifyBufferPositionAtEnd(ECChunk[] inputChunks) {
for (ECChunk chunk : inputChunks) {
if (chunk != null) {
- Assertions.assertEquals(0, chunk.getBuffer().remaining());
+ assertEquals(0, chunk.getBuffer().remaining());
}
}
}
diff --git
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestNativeLibraryLoader.java
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestNativeLibraryLoader.java
index 24218c5687..ed5873770e 100644
---
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestNativeLibraryLoader.java
+++
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestNativeLibraryLoader.java
@@ -19,12 +19,10 @@ package org.apache.hadoop.hdds.utils;
import org.apache.ozone.test.tag.Native;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.MockedStatic;
-import org.mockito.Mockito;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -37,6 +35,11 @@ import static
org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LI
import static
org.apache.hadoop.hdds.utils.NativeLibraryLoader.NATIVE_LIB_TMP_DIR;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.same;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.mockStatic;
/**
* Test class for NativeLibraryLoader.
@@ -58,16 +61,16 @@ public class TestNativeLibraryLoader {
Map<String, Boolean> libraryLoadedMap = new HashMap<>();
NativeLibraryLoader loader = new NativeLibraryLoader(libraryLoadedMap);
try (MockedStatic<NativeLibraryLoader> mockedNativeLibraryLoader =
- Mockito.mockStatic(NativeLibraryLoader.class,
- Mockito.CALLS_REAL_METHODS)) {
+ mockStatic(NativeLibraryLoader.class,
+ CALLS_REAL_METHODS)) {
mockedNativeLibraryLoader.when(() ->
NativeLibraryLoader.getSystemProperty(same(NATIVE_LIB_TMP_DIR)))
.thenReturn(nativeLibraryDirectoryLocation);
mockedNativeLibraryLoader.when(() -> NativeLibraryLoader.getInstance())
.thenReturn(loader);
- Assertions.assertTrue(NativeLibraryLoader.getInstance()
+ assertTrue(NativeLibraryLoader.getInstance()
.loadLibrary(ROCKS_TOOLS_NATIVE_LIBRARY_NAME));
- Assertions.assertTrue(NativeLibraryLoader
+ assertTrue(NativeLibraryLoader
.isLibraryLoaded(ROCKS_TOOLS_NATIVE_LIBRARY_NAME));
// Mocking to force copy random bytes to create a lib file to
// nativeLibraryDirectoryLocation. But load library will fail.
@@ -84,9 +87,9 @@ public class TestNativeLibraryLoader {
.getAbsoluteFile().listFiles((dir, name) ->
name.startsWith(dummyLibraryName) &&
name.endsWith(NativeLibraryLoader.getLibOsSuffix()));
- Assertions.assertNotNull(libPath);
- Assertions.assertEquals(1, libPath.length);
- Assertions.assertTrue(libPath[0].delete());
+ assertNotNull(libPath);
+ assertEquals(1, libPath.length);
+ assertTrue(libPath[0].delete());
}
}
diff --git
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/managed/TestManagedSSTDumpIterator.java
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/managed/TestManagedSSTDumpIterator.java
index 505d68d941..4ef7163ede 100644
---
a/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/managed/TestManagedSSTDumpIterator.java
+++
b/hadoop-hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/db/managed/TestManagedSSTDumpIterator.java
@@ -25,15 +25,11 @@ import org.apache.hadoop.hdds.utils.NativeLibraryLoader;
import org.apache.hadoop.hdds.utils.TestUtils;
import org.apache.ozone.test.tag.Native;
import org.apache.ozone.test.tag.Unhealthy;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -58,6 +54,15 @@ import java.util.stream.IntStream;
import java.util.stream.Stream;
import static
org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LIBRARY_NAME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
/**
* Test for ManagedSSTDumpIterator.
@@ -185,8 +190,7 @@ class TestManagedSSTDumpIterator {
public void testSSTDumpIteratorWithKeyFormat(String keyFormat,
String valueFormat)
throws Exception {
- Assumptions.assumeTrue(NativeLibraryLoader.getInstance()
- .loadLibrary(ROCKS_TOOLS_NATIVE_LIBRARY_NAME));
+
assumeTrue(NativeLibraryLoader.getInstance().loadLibrary(ROCKS_TOOLS_NATIVE_LIBRARY_NAME));
TreeMap<Pair<String, Integer>, String> keys =
IntStream.range(0, 100).boxed().collect(
@@ -232,13 +236,13 @@ class TestManagedSSTDumpIterator {
ManagedSSTDumpIterator.KeyValue r = iterator.next();
String key = new String(r.getKey(), StandardCharsets.UTF_8);
Pair<String, Integer> recordKey = Pair.of(key, r.getType());
- Assertions.assertTrue(expectedKeys.containsKey(recordKey));
- Assertions.assertEquals(Optional.ofNullable(expectedKeys
+ assertTrue(expectedKeys.containsKey(recordKey));
+ assertEquals(Optional.ofNullable(expectedKeys
.get(recordKey)).orElse(""),
new String(r.getValue(), StandardCharsets.UTF_8));
expectedKeys.remove(recordKey);
}
- Assertions.assertEquals(0, expectedKeys.size());
+ assertEquals(0, expectedKeys.size());
} finally {
lowerBound.ifPresent(ManagedSlice::close);
upperBound.ifPresent(ManagedSlice::close);
@@ -256,17 +260,17 @@ class TestManagedSSTDumpIterator {
InterruptedException, IOException {
ByteArrayInputStream byteArrayInputStream =
new ByteArrayInputStream(inputBytes);
- ManagedSSTDumpTool tool = Mockito.mock(ManagedSSTDumpTool.class);
+ ManagedSSTDumpTool tool = mock(ManagedSSTDumpTool.class);
File file = Files.createFile(tempDir.resolve("tmp_file.sst")).toFile();
- Future future = Mockito.mock(Future.class);
- Mockito.when(future.isDone()).thenReturn(false);
- Mockito.when(future.get()).thenReturn(0);
- Mockito.when(tool.run(Matchers.any(Map.class),
- Matchers.any(ManagedOptions.class)))
+ Future future = mock(Future.class);
+ when(future.isDone()).thenReturn(false);
+ when(future.get()).thenReturn(0);
+ when(tool.run(any(Map.class),
+ any(ManagedOptions.class)))
.thenReturn(new ManagedSSTDumpTool.SSTDumpToolTask(future,
byteArrayInputStream));
try (ManagedOptions options = new ManagedOptions()) {
- Assertions.assertThrows(IllegalStateException.class,
+ assertThrows(IllegalStateException.class,
() -> new ManagedSSTDumpIterator<ManagedSSTDumpIterator.KeyValue>(
tool, file.getAbsolutePath(), options) {
@Override
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/compaction/log/TestCompactionFileInfo.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/compaction/log/TestCompactionFileInfo.java
index 6de7330b13..14af10945f 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/compaction/log/TestCompactionFileInfo.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/compaction/log/TestCompactionFileInfo.java
@@ -19,7 +19,6 @@
package org.apache.ozone.compaction.log;
import
org.apache.hadoop.hdds.protocol.proto.HddsProtos.CompactionFileInfoProto;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -28,6 +27,8 @@ import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Test class for CompactionFileInfo.
@@ -62,7 +63,7 @@ public class TestCompactionFileInfo {
CompactionFileInfo compactionFileInfo =
new CompactionFileInfo.Builder(fileName).setStartRange(startRange)
.setEndRange(endRange).setColumnFamily(columnFamily).build();
- Assertions.assertNotNull(compactionFileInfo);
+ assertNotNull(compactionFileInfo);
}
private static Stream<Arguments> compactionFileInfoInvalidScenarios() {
@@ -146,7 +147,7 @@ public class TestCompactionFileInfo {
String endRange,
String columnFamily,
String expectedMessage) {
- RuntimeException exception =
Assertions.assertThrows(RuntimeException.class,
+ RuntimeException exception = assertThrows(RuntimeException.class,
() -> new
CompactionFileInfo.Builder(fileName).setStartRange(startRange)
.setEndRange(endRange).setColumnFamily(columnFamily).build());
assertEquals(expectedMessage, exception.getMessage());
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
index 3b281ee09e..edc491e7c8 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdb/util/TestSstFileSetReader.java
@@ -29,8 +29,6 @@ import
org.apache.hadoop.hdds.utils.db.managed.ManagedSSTDumpTool;
import org.apache.hadoop.hdds.utils.db.managed.ManagedSstFileWriter;
import org.apache.ozone.test.tag.Native;
import org.apache.ozone.test.tag.Unhealthy;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -54,6 +52,10 @@ import java.util.stream.IntStream;
import java.util.stream.Stream;
import static
org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LIBRARY_NAME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
* ManagedSstFileReader tests.
@@ -90,7 +92,7 @@ class TestSstFileSetReader {
}
sstFileWriter.finish();
}
- Assertions.assertTrue(file.exists());
+ assertTrue(file.exists());
return file.getAbsolutePath();
}
@@ -149,11 +151,11 @@ class TestSstFileSetReader {
new SstFileSetReader(files).getKeyStream(
lowerBound.orElse(null), upperBound.orElse(null))) {
keyStream.forEach(key -> {
- Assertions.assertEquals(1, keysInBoundary.get(key));
- Assertions.assertNotNull(keysInBoundary.remove(key));
+ assertEquals(1, keysInBoundary.get(key));
+ assertNotNull(keysInBoundary.remove(key));
});
keysInBoundary.values()
- .forEach(val -> Assertions.assertEquals(0, val));
+ .forEach(val -> assertEquals(0, val));
}
}
}
@@ -165,7 +167,7 @@ class TestSstFileSetReader {
@Unhealthy("HDDS-9274")
public void testGetKeyStreamWithTombstone(int numberOfFiles)
throws RocksDBException, IOException, NativeLibraryNotLoadedException {
- Assumptions.assumeTrue(NativeLibraryLoader.getInstance()
+ assumeTrue(NativeLibraryLoader.getInstance()
.loadLibrary(ROCKS_TOOLS_NATIVE_LIBRARY_NAME));
Pair<SortedMap<String, Integer>, List<String>> data =
createDummyData(numberOfFiles);
@@ -199,10 +201,10 @@ class TestSstFileSetReader {
upperBound.orElse(null))) {
keyStream.forEach(
key -> {
- Assertions.assertNotNull(keysInBoundary.remove(key));
+ assertNotNull(keysInBoundary.remove(key));
});
}
- Assertions.assertEquals(0, keysInBoundary.size());
+ assertEquals(0, keysInBoundary.size());
}
}
} finally {
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
index 75adeb735c..f70b85daeb 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/test/java/org/apache/ozone/rocksdiff/TestRocksDBCheckpointDiffer.java
@@ -65,13 +65,11 @@ import org.apache.ozone.compaction.log.CompactionLogEntry;
import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer.NodeComparator;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Mockito;
import org.rocksdb.Checkpoint;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
@@ -103,6 +101,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Test RocksDBCheckpointDiffer basic functionality.
@@ -161,14 +161,14 @@ public class TestRocksDBCheckpointDiffer {
sstBackUpDir = new File(metadataDirName, sstBackUpDirName);
createDir(sstBackUpDir, metadataDirName + "/" + sstBackUpDirName);
- config = Mockito.mock(ConfigurationSource.class);
+ config = mock(ConfigurationSource.class);
- Mockito.when(config.getTimeDuration(
+ when(config.getTimeDuration(
OZONE_OM_SNAPSHOT_COMPACTION_DAG_MAX_TIME_ALLOWED,
OZONE_OM_SNAPSHOT_COMPACTION_DAG_MAX_TIME_ALLOWED_DEFAULT,
TimeUnit.MILLISECONDS)).thenReturn(MINUTES.toMillis(10));
- Mockito.when(config.getTimeDuration(
+ when(config.getTimeDuration(
OZONE_OM_SNAPSHOT_COMPACTION_DAG_PRUNE_DAEMON_RUN_INTERVAL,
OZONE_OM_SNAPSHOT_PRUNE_COMPACTION_DAG_DAEMON_RUN_INTERVAL_DEFAULT,
TimeUnit.MILLISECONDS)).thenReturn(0L);
@@ -500,8 +500,8 @@ public class TestRocksDBCheckpointDiffer {
}
// Check same and different SST files result
- Assertions.assertEquals(expectedSameSstFiles, actualSameSstFiles);
- Assertions.assertEquals(expectedDiffSstFiles, actualDiffSstFiles);
+ assertEquals(expectedSameSstFiles, actualSameSstFiles);
+ assertEquals(expectedDiffSstFiles, actualDiffSstFiles);
if (expectingException && !exceptionThrown) {
fail("Expecting exception but none thrown.");
@@ -534,7 +534,7 @@ public class TestRocksDBCheckpointDiffer {
try (Stream<Path> sstPathStream = Files.list(sstBackUpDir.toPath())) {
List<String> expectedLinks = sstPathStream.map(Path::getFileName)
.map(Object::toString).sorted().collect(Collectors.toList());
- Assertions.assertEquals(expectedLinks, asList(
+ assertEquals(expectedLinks, asList(
"000017.sst", "000019.sst", "000021.sst", "000023.sst",
"000024.sst", "000026.sst", "000029.sst"));
}
@@ -581,7 +581,7 @@ public class TestRocksDBCheckpointDiffer {
Collections.singletonList("000031"),
Collections.emptyList()
);
- Assertions.assertEquals(snapshots.size(), expectedDifferResult.size());
+ assertEquals(snapshots.size(), expectedDifferResult.size());
int index = 0;
for (DifferSnapshotInfo snap : snapshots) {
@@ -590,7 +590,7 @@ public class TestRocksDBCheckpointDiffer {
LOG.info("SST diff list from '{}' to '{}': {}",
src.getDbPath(), snap.getDbPath(), sstDiffList);
- Assertions.assertEquals(expectedDifferResult.get(index), sstDiffList);
+ assertEquals(expectedDifferResult.get(index), sstDiffList);
++index;
}
}
@@ -1008,8 +1008,8 @@ public class TestRocksDBCheckpointDiffer {
Set<String> expectedFileNodesRemoved) {
Set<String> actualFileNodesRemoved =
rocksDBCheckpointDiffer.pruneBackwardDag(originalDag,
levelToBeRemoved);
- Assertions.assertEquals(expectedDag, originalDag);
- Assertions.assertEquals(actualFileNodesRemoved, expectedFileNodesRemoved);
+ assertEquals(expectedDag, originalDag);
+ assertEquals(actualFileNodesRemoved, expectedFileNodesRemoved);
}
@@ -1063,8 +1063,8 @@ public class TestRocksDBCheckpointDiffer {
Set<String> expectedFileNodesRemoved) {
Set<String> actualFileNodesRemoved =
rocksDBCheckpointDiffer.pruneForwardDag(originalDag, levelToBeRemoved);
- Assertions.assertEquals(expectedDag, originalDag);
- Assertions.assertEquals(actualFileNodesRemoved, expectedFileNodesRemoved);
+ assertEquals(expectedDag, originalDag);
+ assertEquals(actualFileNodesRemoved, expectedFileNodesRemoved);
}
@SuppressWarnings("methodlength")
@@ -1762,8 +1762,8 @@ public class TestRocksDBCheckpointDiffer {
actualDiffSstFiles);
// Check same and different SST files result
- Assertions.assertEquals(expectedSameSstFiles, actualSameSstFiles);
- Assertions.assertEquals(expectedDiffSstFiles, actualDiffSstFiles);
+ assertEquals(expectedSameSstFiles, actualSameSstFiles);
+ assertEquals(expectedDiffSstFiles, actualDiffSstFiles);
}
private static Stream<Arguments> shouldSkipNodeCases() {
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
index 61aacce79a..723828a44b 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManagerScenarios.java
@@ -48,7 +48,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
@@ -69,6 +68,9 @@ import java.util.stream.Stream;
import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -166,36 +168,36 @@ public class TestReplicationManagerScenarios {
public void setup() throws IOException, NodeNotFoundException {
configuration = new OzoneConfiguration();
configuration.set(HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT, "0s");
- containerManager = Mockito.mock(ContainerManager.class);
+ containerManager = mock(ContainerManager.class);
- scmContext = Mockito.mock(SCMContext.class);
- nodeManager = Mockito.mock(NodeManager.class);
+ scmContext = mock(SCMContext.class);
+ nodeManager = mock(NodeManager.class);
ratisPlacementPolicy =
ReplicationTestUtil.getSimpleTestPlacementPolicy(nodeManager, configuration);
ecPlacementPolicy =
ReplicationTestUtil.getSimpleTestPlacementPolicy(nodeManager, configuration);
commandsSent = new HashSet<>();
- eventPublisher = Mockito.mock(EventPublisher.class);
- Mockito.doAnswer(invocation -> {
+ eventPublisher = mock(EventPublisher.class);
+ doAnswer(invocation -> {
commandsSent.add(Pair.of(invocation.getArgument(0),
invocation.getArgument(1)));
return null;
}).when(nodeManager).addDatanodeCommand(any(), any());
- legacyReplicationManager = Mockito.mock(LegacyReplicationManager.class);
+ legacyReplicationManager = mock(LegacyReplicationManager.class);
clock = new TestClock(Instant.now(), ZoneId.systemDefault());
containerReplicaPendingOps = new ContainerReplicaPendingOps(clock);
-
Mockito.when(containerManager.getContainerReplicas(Mockito.any(ContainerID.class))).thenAnswer(
+
when(containerManager.getContainerReplicas(any(ContainerID.class))).thenAnswer(
invocation -> {
ContainerID cid = invocation.getArgument(0);
return containerReplicaMap.get(cid);
});
- Mockito.when(containerManager.getContainers()).thenAnswer(
+ when(containerManager.getContainers()).thenAnswer(
invocation -> new ArrayList<>(containerInfoSet));
- Mockito.when(nodeManager.getNodeStatus(any(DatanodeDetails.class)))
+ when(nodeManager.getNodeStatus(any(DatanodeDetails.class)))
.thenAnswer(invocation -> {
DatanodeDetails dn = invocation.getArgument(0);
return NODE_STATUS_MAP.getOrDefault(dn,
NodeStatus.inServiceHealthy());
@@ -205,14 +207,14 @@ public class TestReplicationManagerScenarios {
for (SCMCommandProto.Type type : SCMCommandProto.Type.values()) {
countMap.put(type, 0);
}
- Mockito.when(
+ when(
nodeManager.getTotalDatanodeCommandCounts(any(DatanodeDetails.class),
any(SCMCommandProto.Type.class), any(SCMCommandProto.Type.class)))
.thenReturn(countMap);
// Ensure that RM will run when asked.
- Mockito.when(scmContext.isLeaderReady()).thenReturn(true);
- Mockito.when(scmContext.isInSafeMode()).thenReturn(false);
+ when(scmContext.isLeaderReady()).thenReturn(true);
+ when(scmContext.isInSafeMode()).thenReturn(false);
containerReplicaMap = new HashMap<>();
containerInfoSet = new HashSet<>();
ORIGINS.clear();
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
index 9b264312fd..c0950e0143 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestInfoSubCommand.java
@@ -32,10 +32,8 @@ import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import picocli.CommandLine;
import java.io.ByteArrayInputStream;
@@ -54,11 +52,14 @@ import java.util.stream.Collectors;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.LifeCycleState.CLOSED;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
/**
* Tests for InfoSubCommand class.
@@ -84,10 +85,8 @@ public class TestInfoSubCommand {
public void setup() throws IOException {
scmClient = mock(ScmClient.class);
datanodes = createDatanodeDetails(3);
- Mockito.when(scmClient.getContainerWithPipeline(anyLong()))
- .then(i -> getContainerWithPipeline(i.getArgument(0)));
- Mockito.when(scmClient.getPipeline(any()))
- .thenThrow(new PipelineNotFoundException("Pipeline not found."));
+ when(scmClient.getContainerWithPipeline(anyLong())).then(i ->
getContainerWithPipeline(i.getArgument(0)));
+ when(scmClient.getPipeline(any())).thenThrow(new
PipelineNotFoundException("Pipeline not found."));
appender = new TestAppender();
logger = Logger.getLogger(
@@ -128,8 +127,7 @@ public class TestInfoSubCommand {
@Test
public void testMultipleContainersCanBePassed() throws Exception {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
- .thenReturn(getReplicas(true));
+
when(scmClient.getContainerReplicas(anyLong())).thenReturn(getReplicas(true));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
c.parseArgs("1", "123", "456", "invalid", "789");
@@ -157,7 +155,7 @@ public class TestInfoSubCommand {
.filter(m -> m.getRenderedMessage()
.matches("(?s)^Container id: (1|123|456|789).*"))
.collect(Collectors.toList());
- Assertions.assertEquals(4, replica.size());
+ assertEquals(4, replica.size());
Pattern p = Pattern.compile(
"^Invalid\\scontainer\\sID:\\sinvalid.*", Pattern.MULTILINE);
@@ -182,8 +180,7 @@ public class TestInfoSubCommand {
@Test
public void testMultipleContainersCanBePassedJson() throws Exception {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
- .thenReturn(getReplicas(true));
+
when(scmClient.getContainerReplicas(anyLong())).thenReturn(getReplicas(true));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
c.parseArgs("1", "123", "456", "invalid", "789", "--json");
@@ -199,7 +196,7 @@ public class TestInfoSubCommand {
.filter(m -> m.getRenderedMessage()
.matches("(?s)^.*\"containerInfo\".*"))
.collect(Collectors.toList());
- Assertions.assertEquals(4, replica.size());
+ assertEquals(4, replica.size());
Pattern p = Pattern.compile(
"^Invalid\\scontainer\\sID:\\sinvalid.*", Pattern.MULTILINE);
@@ -209,8 +206,7 @@ public class TestInfoSubCommand {
private void testReplicaIncludedInOutput(boolean includeIndex)
throws IOException {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
- .thenReturn(getReplicas(includeIndex));
+
when(scmClient.getContainerReplicas(anyLong())).thenReturn(getReplicas(includeIndex));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
c.parseArgs("1");
@@ -221,14 +217,14 @@ public class TestInfoSubCommand {
List<LoggingEvent> replica = logs.stream()
.filter(m -> m.getRenderedMessage().matches("(?s)^Replicas:.*"))
.collect(Collectors.toList());
- Assertions.assertEquals(1, replica.size());
+ assertEquals(1, replica.size());
// Ensure each DN UUID is mentioned in the message:
for (DatanodeDetails dn : datanodes) {
Pattern pattern = Pattern.compile(".*" + dn.getUuid().toString() + ".*",
Pattern.DOTALL);
Matcher matcher = pattern.matcher(replica.get(0).getRenderedMessage());
- Assertions.assertTrue(matcher.matches());
+ assertTrue(matcher.matches());
}
// Ensure the replicaIndex output is in order
if (includeIndex) {
@@ -237,19 +233,19 @@ public class TestInfoSubCommand {
String temp = "ReplicaIndex: " + i;
indexList.add(replica.get(0).getRenderedMessage().indexOf(temp));
}
- Assertions.assertEquals(datanodes.size(), indexList.size());
- Assertions.assertTrue(inSort(indexList));
+ assertEquals(datanodes.size(), indexList.size());
+ assertTrue(inSort(indexList));
}
// Ensure ReplicaIndex is not mentioned as it was not passed in the proto:
Pattern pattern = Pattern.compile(".*ReplicaIndex.*",
Pattern.DOTALL);
Matcher matcher = pattern.matcher(replica.get(0).getRenderedMessage());
- Assertions.assertEquals(includeIndex, matcher.matches());
+ assertEquals(includeIndex, matcher.matches());
}
@Test
public void testReplicasNotOutputIfError() throws IOException {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
+ when(scmClient.getContainerReplicas(anyLong()))
.thenThrow(new IOException("Error getting Replicas"));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
@@ -261,7 +257,7 @@ public class TestInfoSubCommand {
List<LoggingEvent> replica = logs.stream()
.filter(m -> m.getRenderedMessage().matches("(?s)^Replicas:.*"))
.collect(Collectors.toList());
- Assertions.assertEquals(0, replica.size());
+ assertEquals(0, replica.size());
Pattern p = Pattern.compile(
"^Unable to retrieve the replica details.*", Pattern.MULTILINE);
@@ -271,7 +267,7 @@ public class TestInfoSubCommand {
@Test
public void testReplicasNotOutputIfErrorWithJson() throws IOException {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
+ when(scmClient.getContainerReplicas(anyLong()))
.thenThrow(new IOException("Error getting Replicas"));
cmd = new InfoSubcommand();
CommandLine c = new CommandLine(cmd);
@@ -279,25 +275,23 @@ public class TestInfoSubCommand {
cmd.execute(scmClient);
List<LoggingEvent> logs = appender.getLog();
- Assertions.assertEquals(1, logs.size());
+ assertEquals(1, logs.size());
String json = logs.get(0).getRenderedMessage();
- Assertions.assertFalse(json.matches("(?s).*replicas.*"));
+ assertFalse(json.matches("(?s).*replicas.*"));
}
@Test
public void testReplicasOutputWithJson() throws IOException {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
+ when(scmClient.getContainerReplicas(anyLong()))
.thenReturn(getReplicas(true));
testJsonOutput();
}
@Test
public void testECContainerReplicasOutputWithJson() throws IOException {
- Mockito.when(scmClient.getContainerReplicas(anyLong()))
- .thenReturn(getReplicas(true));
- Mockito.when(scmClient.getContainerWithPipeline(anyLong()))
- .thenReturn(getECContainerWithPipeline());
+
when(scmClient.getContainerReplicas(anyLong())).thenReturn(getReplicas(true));
+
when(scmClient.getContainerWithPipeline(anyLong())).thenReturn(getECContainerWithPipeline());
testJsonOutput();
}
@@ -317,21 +311,21 @@ public class TestInfoSubCommand {
cmd.execute(scmClient);
List<LoggingEvent> logs = appender.getLog();
- Assertions.assertEquals(1, logs.size());
+ assertEquals(1, logs.size());
// Ensure each DN UUID is mentioned in the message after replicas:
String json = logs.get(0).getRenderedMessage();
- Assertions.assertTrue(json.matches("(?s).*replicas.*"));
+ assertTrue(json.matches("(?s).*replicas.*"));
for (DatanodeDetails dn : datanodes) {
Pattern pattern = Pattern.compile(
".*replicas.*" + dn.getUuid().toString() + ".*", Pattern.DOTALL);
Matcher matcher = pattern.matcher(json);
- Assertions.assertTrue(matcher.matches());
+ assertTrue(matcher.matches());
}
Pattern pattern = Pattern.compile(".*replicaIndex.*",
Pattern.DOTALL);
Matcher matcher = pattern.matcher(json);
- Assertions.assertTrue(matcher.matches());
+ assertTrue(matcher.matches());
}
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
index 6ebb7b3c59..58eeaee3d2 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/TestReportSubCommand.java
@@ -26,7 +26,6 @@ import
org.apache.hadoop.hdds.scm.container.ReplicationManagerReport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import picocli.CommandLine;
import java.io.ByteArrayOutputStream;
@@ -40,6 +39,7 @@ import java.util.regex.Pattern;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests for the Container ReportSubCommand class.
@@ -70,8 +70,7 @@ public class TestReportSubCommand {
@Test
public void testCorrectValuesAppearInEmptyReport() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getReplicationManagerReport())
- .thenAnswer(invocation -> new ReplicationManagerReport());
+ when(scmClient.getReplicationManagerReport()).thenAnswer(invocation -> new
ReplicationManagerReport());
cmd.execute(scmClient);
@@ -96,8 +95,7 @@ public class TestReportSubCommand {
// More complete testing of the Report JSON output is in
// TestReplicationManagerReport.
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getReplicationManagerReport())
- .thenAnswer(invocation -> new ReplicationManagerReport());
+ when(scmClient.getReplicationManagerReport()).thenAnswer(invocation -> new
ReplicationManagerReport());
CommandLine c = new CommandLine(cmd);
c.parseArgs("--json");
@@ -114,8 +112,7 @@ public class TestReportSubCommand {
@Test
public void testCorrectValuesAppearInReport() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getReplicationManagerReport())
- .thenAnswer(invocation -> createReport());
+ when(scmClient.getReplicationManagerReport()).thenAnswer(invocation ->
createReport());
cmd.execute(scmClient);
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/upgrade/TestUpgradeManager.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/upgrade/TestUpgradeManager.java
index ee02f0e506..33c01e4abd 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/upgrade/TestUpgradeManager.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/container/upgrade/TestUpgradeManager.java
@@ -49,7 +49,6 @@ import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
@@ -70,6 +69,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests for UpgradeManager class.
@@ -124,14 +124,13 @@ public class TestUpgradeManager {
volumes.add(hddsVolume);
}
- DatanodeDetails datanodeDetails = Mockito.mock(DatanodeDetails.class);
- Mockito.when(datanodeDetails.getUuidString())
- .thenReturn(datanodeId.toString());
- Mockito.when(datanodeDetails.getUuid()).thenReturn(datanodeId);
+ DatanodeDetails datanodeDetails = mock(DatanodeDetails.class);
+ when(datanodeDetails.getUuidString()).thenReturn(datanodeId.toString());
+ when(datanodeDetails.getUuid()).thenReturn(datanodeId);
volumeChoosingPolicy = mock(RoundRobinVolumeChoosingPolicy.class);
final AtomicInteger loopCount = new AtomicInteger(0);
- Mockito.when(volumeChoosingPolicy.chooseVolume(anyList(), anyLong()))
+ when(volumeChoosingPolicy.chooseVolume(anyList(), anyLong()))
.thenAnswer(invocation -> {
final int ii = loopCount.getAndIncrement() % volumes.size();
return volumes.get(ii);
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
index 4d4e0194a5..e271cdfe02 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestContainerBalancerSubCommand.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -37,6 +36,7 @@ import java.util.regex.Pattern;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the ContainerBalancerSubCommand class includes the
@@ -74,8 +74,7 @@ public class TestContainerBalancerSubCommand {
ScmClient scmClient = mock(ScmClient.class);
//test status is running
- Mockito.when(scmClient.getContainerBalancerStatus())
- .thenAnswer(invocation -> true);
+ when(scmClient.getContainerBalancerStatus()).thenAnswer(invocation ->
true);
statusCmd.execute(scmClient);
@@ -90,8 +89,7 @@ public class TestContainerBalancerSubCommand {
throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getContainerBalancerStatus())
- .thenAnswer(invocation -> false);
+ when(scmClient.getContainerBalancerStatus()).thenAnswer(invocation ->
false);
statusCmd.execute(scmClient);
@@ -115,7 +113,7 @@ public class TestContainerBalancerSubCommand {
public void testContainerBalancerStartSubcommandWhenBalancerIsNotRunning()
throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.startContainerBalancer(
+ when(scmClient.startContainerBalancer(
null, null, null, null, null, null))
.thenReturn(
StorageContainerLocationProtocolProtos
@@ -134,7 +132,7 @@ public class TestContainerBalancerSubCommand {
public void testContainerBalancerStartSubcommandWhenBalancerIsRunning()
throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.startContainerBalancer(
+ when(scmClient.startContainerBalancer(
null, null, null, null, null, null))
.thenReturn(StorageContainerLocationProtocolProtos
.StartContainerBalancerResponseProto.newBuilder()
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
index 99c930a3ee..902ee5e7a8 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionStatusSubCommand.java
@@ -34,13 +34,13 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.mockito.Mockito;
import picocli.CommandLine;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the DecommissionStatusSubCommand class includes the
@@ -72,7 +72,7 @@ public class TestDecommissionStatusSubCommand {
@Test
public void testSuccessWhenDecommissionStatus() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenAnswer(invocation -> nodes); // 2 nodes decommissioning
cmd.execute(scmClient);
@@ -94,7 +94,7 @@ public class TestDecommissionStatusSubCommand {
public void testNoNodesWhenDecommissionStatus() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
// No nodes in decommissioning. No error is printed
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenReturn(new ArrayList<>());
cmd.execute(scmClient);
@@ -115,7 +115,7 @@ public class TestDecommissionStatusSubCommand {
@Test
public void testIdOptionDecommissionStatusSuccess() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenAnswer(invocation -> nodes); // 2 nodes decommissioning
CommandLine c = new CommandLine(cmd);
@@ -135,7 +135,7 @@ public class TestDecommissionStatusSubCommand {
@Test
public void testIdOptionDecommissionStatusFail() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenAnswer(invocation -> nodes.subList(0, 1)); // host0
decommissioning
CommandLine c = new CommandLine(cmd);
@@ -159,7 +159,7 @@ public class TestDecommissionStatusSubCommand {
@Test
public void testIpOptionDecommissionStatusSuccess() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenAnswer(invocation -> nodes); // 2 nodes decommissioning
CommandLine c = new CommandLine(cmd);
@@ -179,7 +179,7 @@ public class TestDecommissionStatusSubCommand {
@Test
public void testIpOptionDecommissionStatusFail() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
+ when(scmClient.queryNode(any(), any(), any(), any()))
.thenAnswer(invocation -> nodes.subList(0, 1)); // host0
decommissioning
CommandLine c = new CommandLine(cmd);
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
index 72ffd1ca71..7054b86069 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestDecommissionSubCommand.java
@@ -32,13 +32,13 @@ import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.mockito.Mockito;
import picocli.CommandLine;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the DecommissionSubCommand class includes the
@@ -69,7 +69,7 @@ public class TestDecommissionSubCommand {
@Test
public void testNoErrorsWhenDecommissioning() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.decommissionNodes(anyListOf(String.class)))
+ when(scmClient.decommissionNodes(anyListOf(String.class)))
.thenAnswer(invocation -> new ArrayList<DatanodeAdminError>());
CommandLine c = new CommandLine(cmd);
@@ -93,7 +93,7 @@ public class TestDecommissionSubCommand {
@Test
public void testErrorsReportedWhenDecommissioning() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.decommissionNodes(anyListOf(String.class)))
+ when(scmClient.decommissionNodes(anyListOf(String.class)))
.thenAnswer(invocation -> {
ArrayList<DatanodeAdminError> e = new ArrayList<>();
e.add(new DatanodeAdminError("host1", "host1 error"));
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
index 3c3d1bb642..b6ae0a8ff4 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestListInfoSubcommand.java
@@ -32,11 +32,11 @@ import java.util.List;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.mockito.Mockito;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the TestListInfoSubCommand class includes the
@@ -68,10 +68,8 @@ public class TestListInfoSubcommand {
public void testDataNodeOperationalStateAndHealthIncludedInOutput()
throws Exception {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.queryNode(any(), any(), any(), any()))
- .thenAnswer(invocation -> getNodeDetails());
- Mockito.when(scmClient.listPipelines())
- .thenReturn(new ArrayList<>());
+ when(scmClient.queryNode(any(), any(), any(),
any())).thenAnswer(invocation -> getNodeDetails());
+ when(scmClient.listPipelines()).thenReturn(new ArrayList<>());
cmd.execute(scmClient);
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
index 63b260f3a1..1f8906a3b6 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestMaintenanceSubCommand.java
@@ -32,7 +32,6 @@ import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.mockito.Mockito;
import picocli.CommandLine;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,6 +39,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the DecommissionSubCommand class includes the
@@ -70,7 +70,7 @@ public class TestMaintenanceSubCommand {
@Test
public void testNoErrorsWhenEnteringMaintenance() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.startMaintenanceNodes(
+ when(scmClient.startMaintenanceNodes(
anyListOf(String.class), anyInt()))
.thenAnswer(invocation -> new ArrayList<DatanodeAdminError>());
@@ -96,7 +96,7 @@ public class TestMaintenanceSubCommand {
@Test
public void testErrorsReportedWhenEnteringMaintenance() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.startMaintenanceNodes(
+ when(scmClient.startMaintenanceNodes(
anyListOf(String.class), anyInt()))
.thenAnswer(invocation -> {
ArrayList<DatanodeAdminError> e = new ArrayList<>();
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
index 47def85c05..e05adbc50b 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestRecommissionSubCommand.java
@@ -32,13 +32,13 @@ import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.mockito.Mockito;
import picocli.CommandLine;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Unit tests to validate the the RecommissionSubCommand class includes the
@@ -69,7 +69,7 @@ public class TestRecommissionSubCommand {
@Test
public void testNoErrorsWhenRecommissioning() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.recommissionNodes(anyListOf(String.class)))
+ when(scmClient.recommissionNodes(anyListOf(String.class)))
.thenAnswer(invocation -> new ArrayList<DatanodeAdminError>());
CommandLine c = new CommandLine(cmd);
@@ -93,7 +93,7 @@ public class TestRecommissionSubCommand {
@Test
public void testErrorsReportedWhenRecommissioning() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.recommissionNodes(anyListOf(String.class)))
+ when(scmClient.recommissionNodes(anyListOf(String.class)))
.thenAnswer(invocation -> {
ArrayList<DatanodeAdminError> e = new ArrayList<>();
e.add(new DatanodeAdminError("host1", "host1 error"));
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
index a52a0a7ed8..db777e4396 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/datanode/TestUsageInfoSubcommand.java
@@ -24,10 +24,8 @@ import org.apache.hadoop.hdds.protocol.MockDatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import picocli.CommandLine;
import java.io.ByteArrayOutputStream;
@@ -39,7 +37,13 @@ import java.util.ArrayList;
import java.util.List;
import static com.fasterxml.jackson.databind.node.JsonNodeType.ARRAY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Test for the UsageInfoSubCommand class.
@@ -69,9 +73,7 @@ public class TestUsageInfoSubcommand {
@Test
public void testCorrectJsonValuesInReport() throws IOException {
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getDatanodeUsageInfo(
- Mockito.anyBoolean(), Mockito.anyInt()))
- .thenAnswer(invocation -> getUsageProto());
+ when(scmClient.getDatanodeUsageInfo(anyBoolean(),
anyInt())).thenAnswer(invocation -> getUsageProto());
CommandLine c = new CommandLine(cmd);
c.parseArgs("-m", "--json");
@@ -80,30 +82,25 @@ public class TestUsageInfoSubcommand {
ObjectMapper mapper = new ObjectMapper();
JsonNode json = mapper.readTree(outContent.toString("UTF-8"));
- Assertions.assertEquals(ARRAY, json.getNodeType());
- Assertions.assertNotNull(json.get(0).get("datanodeDetails"));
- Assertions.assertEquals(10, json.get(0).get("ozoneUsed").longValue());
- Assertions.assertEquals(100, json.get(0).get("capacity").longValue());
- Assertions.assertEquals(80, json.get(0).get("remaining").longValue());
- Assertions.assertEquals(20, json.get(0).get("totalUsed").longValue());
-
- Assertions.assertEquals(20.00,
- json.get(0).get("totalUsedPercent").doubleValue(), 0.001);
- Assertions.assertEquals(10.00,
- json.get(0).get("ozoneUsedPercent").doubleValue(), 0.001);
- Assertions.assertEquals(80.00,
- json.get(0).get("remainingPercent").doubleValue(), 0.001);
-
- Assertions.assertEquals(5,
- json.get(0).get("containerCount").longValue());
+ assertEquals(ARRAY, json.getNodeType());
+ assertNotNull(json.get(0).get("datanodeDetails"));
+ assertEquals(10, json.get(0).get("ozoneUsed").longValue());
+ assertEquals(100, json.get(0).get("capacity").longValue());
+ assertEquals(80, json.get(0).get("remaining").longValue());
+ assertEquals(20, json.get(0).get("totalUsed").longValue());
+
+ assertEquals(20.00, json.get(0).get("totalUsedPercent").doubleValue(),
0.001);
+ assertEquals(10.00, json.get(0).get("ozoneUsedPercent").doubleValue(),
0.001);
+ assertEquals(80.00, json.get(0).get("remainingPercent").doubleValue(),
0.001);
+
+ assertEquals(5, json.get(0).get("containerCount").longValue());
}
@Test
public void testOutputDataFieldsAligning() throws IOException {
// given
ScmClient scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.getDatanodeUsageInfo(
- Mockito.anyBoolean(), Mockito.anyInt()))
+ when(scmClient.getDatanodeUsageInfo(anyBoolean(), anyInt()))
.thenAnswer(invocation -> getUsageProto());
CommandLine c = new CommandLine(cmd);
@@ -114,20 +111,20 @@ public class TestUsageInfoSubcommand {
// then
String output = outContent.toString(CharEncoding.UTF_8);
- Assertions.assertTrue(output.contains("UUID :"));
- Assertions.assertTrue(output.contains("IP Address :"));
- Assertions.assertTrue(output.contains("Hostname :"));
- Assertions.assertTrue(output.contains("Capacity :"));
- Assertions.assertTrue(output.contains("Total Used :"));
- Assertions.assertTrue(output.contains("Total Used % :"));
- Assertions.assertTrue(output.contains("Ozone Used :"));
- Assertions.assertTrue(output.contains("Ozone Used % :"));
- Assertions.assertTrue(output.contains("Remaining :"));
- Assertions.assertTrue(output.contains("Remaining % :"));
- Assertions.assertTrue(output.contains("Container(s) :"));
- Assertions.assertTrue(output.contains("Container Pre-allocated :"));
- Assertions.assertTrue(output.contains("Remaining Allocatable :"));
- Assertions.assertTrue(output.contains("Free Space To Spare :"));
+ assertTrue(output.contains("UUID :"));
+ assertTrue(output.contains("IP Address :"));
+ assertTrue(output.contains("Hostname :"));
+ assertTrue(output.contains("Capacity :"));
+ assertTrue(output.contains("Total Used :"));
+ assertTrue(output.contains("Total Used % :"));
+ assertTrue(output.contains("Ozone Used :"));
+ assertTrue(output.contains("Ozone Used % :"));
+ assertTrue(output.contains("Remaining :"));
+ assertTrue(output.contains("Remaining % :"));
+ assertTrue(output.contains("Container(s) :"));
+ assertTrue(output.contains("Container Pre-allocated :"));
+ assertTrue(output.contains("Remaining Allocatable :"));
+ assertTrue(output.contains("Free Space To Spare :"));
}
private List<HddsProtos.DatanodeUsageInfoProto> getUsageProto() {
diff --git
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
index f4909b0d16..93b176e2b3 100644
---
a/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
+++
b/hadoop-hdds/tools/src/test/java/org/apache/hadoop/hdds/scm/cli/pipeline/TestListPipelinesSubCommand.java
@@ -27,10 +27,8 @@ import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineID;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import picocli.CommandLine;
import java.io.ByteArrayOutputStream;
@@ -43,7 +41,10 @@ import java.util.UUID;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
import static
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests for the ListPipelineSubCommand class.
@@ -65,8 +66,7 @@ public class TestListPipelinesSubCommand {
System.setErr(new PrintStream(errContent, false, DEFAULT_ENCODING));
scmClient = mock(ScmClient.class);
- Mockito.when(scmClient.listPipelines())
- .thenAnswer(invocation -> createPipelines());
+ when(scmClient.listPipelines()).thenAnswer(invocation ->
createPipelines());
}
@AfterEach
@@ -80,8 +80,7 @@ public class TestListPipelinesSubCommand {
CommandLine c = new CommandLine(cmd);
c.parseArgs();
cmd.execute(scmClient);
- Assertions.assertEquals(6, outContent.toString(DEFAULT_ENCODING)
- .split(System.getProperty("line.separator")).length);
+ assertEquals(6,
outContent.toString(DEFAULT_ENCODING).split(System.getProperty("line.separator")).length);
}
@Test
@@ -90,17 +89,15 @@ public class TestListPipelinesSubCommand {
c.parseArgs("-s", "OPEN");
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(3, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("CLOSED"));
+ assertEquals(3, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("CLOSED"));
}
@Test
public void testExceptionIfReplicationWithoutType() {
CommandLine c = new CommandLine(cmd);
c.parseArgs("-r", "THREE");
- Assertions.assertThrows(IllegalArgumentException.class,
- () -> cmd.execute(scmClient));
+ assertThrows(IllegalArgumentException.class, () -> cmd.execute(scmClient));
}
@Test
@@ -110,9 +107,8 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(1, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("EC"));
+ assertEquals(1, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("EC"));
}
@Test
@@ -122,9 +118,8 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(2, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("EC"));
+ assertEquals(2, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("EC"));
}
@Test
@@ -134,17 +129,15 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(2, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("EC"));
+ assertEquals(2, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("EC"));
}
@Test
public void factorAndReplicationAreMutuallyExclusive() {
CommandLine c = new CommandLine(cmd);
c.parseArgs("-r", "THREE", "-ffc", "ONE");
- Assertions.assertThrows(IllegalArgumentException.class,
- () -> cmd.execute(scmClient));
+ assertThrows(IllegalArgumentException.class, () -> cmd.execute(scmClient));
}
@Test
@@ -154,10 +147,8 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(1, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1,
- output.indexOf("ReplicationConfig: RATIS"));
+ assertEquals(1, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("ReplicationConfig: RATIS"));
}
@Test
@@ -167,10 +158,9 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(1, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("CLOSED"));
- Assertions.assertEquals(-1, output.indexOf("EC"));
+ assertEquals(1, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("CLOSED"));
+ assertEquals(-1, output.indexOf("EC"));
}
@Test
@@ -180,10 +170,9 @@ public class TestListPipelinesSubCommand {
cmd.execute(scmClient);
String output = outContent.toString(DEFAULT_ENCODING);
- Assertions.assertEquals(1, output.split(
- System.getProperty("line.separator")).length);
- Assertions.assertEquals(-1, output.indexOf("CLOSED"));
- Assertions.assertEquals(-1, output.indexOf("EC"));
+ assertEquals(1, output.split(System.getProperty("line.separator")).length);
+ assertEquals(-1, output.indexOf("CLOSED"));
+ assertEquals(-1, output.indexOf("EC"));
}
private List<Pipeline> createPipelines() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
