You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by ro...@apache.org on 2022/07/29 07:51:45 UTC
[incubator-uniffle] branch master updated: [Improvement] Fix common module code style (#99)
This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new b40b47a [Improvement] Fix common module code style (#99)
b40b47a is described below
commit b40b47ad4405480ae8ca827eb953d5dfcae1f96c
Author: roryqi <je...@gmail.com>
AuthorDate: Fri Jul 29 15:51:41 2022 +0800
[Improvement] Fix common module code style (#99)
### What changes were proposed in this pull request?
To solve common module code style in pr https://github.com/Tencent/Firestorm/pull/155
### Why are the changes needed?
Improve our test code style
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
I add the test code style check commits, common module passed.
https://github.com/jerqi/incubator-uniffle/runs/7572429851?check_suite_focus=true
---
.../org/apache/uniffle/common/ArgumentsTest.java | 6 +-
.../apache/uniffle/common/PartitionRangeTest.java | 4 +-
.../uniffle/common/RemoteStorageInfoTest.java | 11 +-
.../apache/uniffle/common/RssShuffleUtilsTest.java | 2 +-
.../uniffle/common/ShuffleBlockInfoTest.java | 31 ++---
.../uniffle/common/ShuffleDataResultTest.java | 1 +
.../common/ShufflePartitionedBlockTest.java | 19 +--
.../uniffle/common/ShufflePartitionedDataTest.java | 9 +-
.../uniffle/common/ShuffleRegisterInfoTest.java | 5 +-
.../uniffle/common/ShuffleServerInfoTest.java | 8 +-
.../uniffle/common/config/ConfigOptionTest.java | 14 ++-
.../apache/uniffle/common/config/RssConfTest.java | 127 ++++++++++-----------
.../uniffle/common/metrics/MetricsManagerTest.java | 17 +--
.../uniffle/common/util/ChecksumUtilsTest.java | 7 +-
.../apache/uniffle/common/util/ExitUtilsTest.java | 40 +++----
.../apache/uniffle/common/util/RssUtilsTest.java | 6 +-
.../uniffle/common/util/UnitConverterTest.java | 10 +-
.../apache/uniffle/common/web/JettyServerTest.java | 15 +--
18 files changed, 171 insertions(+), 161 deletions(-)
diff --git a/common/src/test/java/org/apache/uniffle/common/ArgumentsTest.java b/common/src/test/java/org/apache/uniffle/common/ArgumentsTest.java
index b11501b..8155d94 100644
--- a/common/src/test/java/org/apache/uniffle/common/ArgumentsTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ArgumentsTest.java
@@ -17,12 +17,12 @@
package org.apache.uniffle.common;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import org.junit.jupiter.api.Test;
import picocli.CommandLine;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class ArgumentsTest {
private static final String confFile = ClassLoader.getSystemResource("server.conf").getFile();
diff --git a/common/src/test/java/org/apache/uniffle/common/PartitionRangeTest.java b/common/src/test/java/org/apache/uniffle/common/PartitionRangeTest.java
index 0025b6a..b6433b0 100644
--- a/common/src/test/java/org/apache/uniffle/common/PartitionRangeTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/PartitionRangeTest.java
@@ -41,13 +41,13 @@ public class PartitionRangeTest {
public void testEquals() {
PartitionRange partitionRange1 = new PartitionRange(1, 2);
PartitionRange partitionRange2 = new PartitionRange(1, 2);
- PartitionRange partitionRange3 = new PartitionRange(1, 1);
- PartitionRange partitionRange4 = new PartitionRange(2, 2);
assertEquals(partitionRange1, partitionRange1);
assertEquals(partitionRange1.hashCode(), partitionRange1.hashCode());
assertEquals(partitionRange1, partitionRange2);
assertEquals(partitionRange1.hashCode(), partitionRange2.hashCode());
+ PartitionRange partitionRange3 = new PartitionRange(1, 1);
assertNotEquals(partitionRange1, partitionRange3);
+ PartitionRange partitionRange4 = new PartitionRange(2, 2);
assertNotEquals(partitionRange1, partitionRange4);
assertNotEquals(partitionRange1, null);
assertNotEquals(partitionRange1, new Object());
diff --git a/common/src/test/java/org/apache/uniffle/common/RemoteStorageInfoTest.java b/common/src/test/java/org/apache/uniffle/common/RemoteStorageInfoTest.java
index a5ba988..d9faa32 100644
--- a/common/src/test/java/org/apache/uniffle/common/RemoteStorageInfoTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/RemoteStorageInfoTest.java
@@ -17,8 +17,12 @@
package org.apache.uniffle.common;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
import com.google.common.collect.ImmutableMap;
-import org.apache.uniffle.common.util.Constants;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -26,10 +30,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.NullAndEmptySource;
import org.junit.jupiter.params.provider.ValueSource;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
+import org.apache.uniffle.common.util.Constants;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/common/src/test/java/org/apache/uniffle/common/RssShuffleUtilsTest.java b/common/src/test/java/org/apache/uniffle/common/RssShuffleUtilsTest.java
index 781b2d5..1dd51eb 100644
--- a/common/src/test/java/org/apache/uniffle/common/RssShuffleUtilsTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/RssShuffleUtilsTest.java
@@ -18,8 +18,8 @@
package org.apache.uniffle.common;
import java.nio.ByteBuffer;
-import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git a/common/src/test/java/org/apache/uniffle/common/ShuffleBlockInfoTest.java b/common/src/test/java/org/apache/uniffle/common/ShuffleBlockInfoTest.java
index 671ea56..a39f607 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShuffleBlockInfoTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShuffleBlockInfoTest.java
@@ -19,6 +19,7 @@ package org.apache.uniffle.common;
import java.util.Collections;
import java.util.List;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,24 +32,24 @@ public class ShuffleBlockInfoTest {
Collections.singletonList(new ShuffleServerInfo("0", "localhost", 1234));
ShuffleBlockInfo info = new ShuffleBlockInfo(1, 2, 3, 4, 5, new byte[6],
shuffleServerInfos, 7, 8, 9);
- assertEquals("ShuffleBlockInfo:shuffleId[" + info.getShuffleId() +
- "],partitionId[" + info.getPartitionId() +
- "],blockId[" + info.getBlockId() +
- "],length[" + info.getLength() +
- "],uncompressLength[" + info.getUncompressLength() +
- "],crc[" + info.getCrc() +
- "],shuffleServer[0,]",
- info.toString());
+ assertEquals("ShuffleBlockInfo:shuffleId[" + info.getShuffleId()
+ + "],partitionId[" + info.getPartitionId()
+ + "],blockId[" + info.getBlockId()
+ + "],length[" + info.getLength()
+ + "],uncompressLength[" + info.getUncompressLength()
+ + "],crc[" + info.getCrc()
+ + "],shuffleServer[0,]",
+ info.toString());
ShuffleBlockInfo info2 = new ShuffleBlockInfo(1, 2, 3, 4, 5, new byte[6],
null, 7, 8, 9);
- assertEquals("ShuffleBlockInfo:shuffleId[" + info2.getShuffleId() +
- "],partitionId[" + info2.getPartitionId() +
- "],blockId[" + info2.getBlockId() +
- "],length[" + info2.getLength() +
- "],uncompressLength[" + info2.getUncompressLength() +
- "],crc[" + info2.getCrc() +
- "],shuffleServer is empty",
+ assertEquals("ShuffleBlockInfo:shuffleId[" + info2.getShuffleId()
+ + "],partitionId[" + info2.getPartitionId()
+ + "],blockId[" + info2.getBlockId()
+ + "],length[" + info2.getLength()
+ + "],uncompressLength[" + info2.getUncompressLength()
+ + "],crc[" + info2.getCrc()
+ + "],shuffleServer is empty",
info2.toString());
}
}
diff --git a/common/src/test/java/org/apache/uniffle/common/ShuffleDataResultTest.java b/common/src/test/java/org/apache/uniffle/common/ShuffleDataResultTest.java
index 3a2bdd1..526a4e8 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShuffleDataResultTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShuffleDataResultTest.java
@@ -19,6 +19,7 @@ package org.apache.uniffle.common;
import java.util.Collections;
import java.util.List;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedBlockTest.java b/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedBlockTest.java
index 1cf3aff..d8e660d 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedBlockTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedBlockTest.java
@@ -17,15 +17,16 @@
package org.apache.uniffle.common;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
import java.util.Random;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
public class ShufflePartitionedBlockTest {
@Test
@@ -70,11 +71,11 @@ public class ShufflePartitionedBlockTest {
@Test
public void testToString() {
ShufflePartitionedBlock b1 = new ShufflePartitionedBlock(1, 2, 3, 4, 5, new byte[6]);
- assertEquals("ShufflePartitionedBlock{blockId[" + b1.getBlockId() +
- "], length[" + b1.getLength() +
- "], uncompressLength[" + b1.getUncompressLength() +
- "], crc[" + b1.getCrc() +
- "], taskAttemptId[" + b1.getTaskAttemptId() + "]}",
+ assertEquals("ShufflePartitionedBlock{blockId[" + b1.getBlockId()
+ + "], length[" + b1.getLength()
+ + "], uncompressLength[" + b1.getUncompressLength()
+ + "], crc[" + b1.getCrc()
+ + "], taskAttemptId[" + b1.getTaskAttemptId() + "]}",
b1.toString());
}
diff --git a/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedDataTest.java b/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedDataTest.java
index 04529fb..7ac851c 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedDataTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShufflePartitionedDataTest.java
@@ -18,6 +18,7 @@
package org.apache.uniffle.common;
import java.util.Arrays;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,12 +28,12 @@ public class ShufflePartitionedDataTest {
@Test
public void testToString() {
ShufflePartitionedData data = new ShufflePartitionedData(0, new ShufflePartitionedBlock[]{});
- assertEquals("ShufflePartitionedData{partitionId=" + data.getPartitionId() + ", blockList=" +
- Arrays.toString(data.getBlockList()) + "}", data.toString());
+ assertEquals("ShufflePartitionedData{partitionId=" + data.getPartitionId() + ", blockList="
+ + Arrays.toString(data.getBlockList()) + "}", data.toString());
ShufflePartitionedData data1 = new ShufflePartitionedData(1,
new ShufflePartitionedBlock[]{new ShufflePartitionedBlock(2, 3, 4, 5, 6, new byte[0])});
- assertEquals("ShufflePartitionedData{partitionId=" + data1.getPartitionId() + ", blockList=" +
- Arrays.toString(data1.getBlockList()) + "}", data1.toString());
+ assertEquals("ShufflePartitionedData{partitionId=" + data1.getPartitionId() + ", blockList="
+ + Arrays.toString(data1.getBlockList()) + "}", data1.toString());
ShufflePartitionedData data2 = new ShufflePartitionedData(0, null);
assertEquals("ShufflePartitionedData{partitionId=0, blockList=null}", data2.toString());
data2.setPartitionId(1);
diff --git a/common/src/test/java/org/apache/uniffle/common/ShuffleRegisterInfoTest.java b/common/src/test/java/org/apache/uniffle/common/ShuffleRegisterInfoTest.java
index a83f42a..88e538c 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShuffleRegisterInfoTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShuffleRegisterInfoTest.java
@@ -19,6 +19,7 @@ package org.apache.uniffle.common;
import java.util.Collections;
import java.util.List;
+
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,15 +33,15 @@ public class ShuffleRegisterInfoTest {
List<PartitionRange> partitionRanges = Collections.singletonList(new PartitionRange(2, 3));
ShuffleRegisterInfo info1 = new ShuffleRegisterInfo(shuffleServerInfo, partitionRanges);
ShuffleRegisterInfo info2 = new ShuffleRegisterInfo(info1.getShuffleServerInfo(), info1.getPartitionRanges());
- ShuffleRegisterInfo info3 = new ShuffleRegisterInfo(info1.getShuffleServerInfo(), null);
- ShuffleRegisterInfo info4 = new ShuffleRegisterInfo(null, info1.getPartitionRanges());
assertEquals(info1, info1);
assertEquals(info1.hashCode(), info1.hashCode());
assertEquals(info1, info2);
assertEquals(info1.hashCode(), info2.hashCode());
assertNotEquals(info1, null);
assertNotEquals(info1, new Object());
+ ShuffleRegisterInfo info3 = new ShuffleRegisterInfo(info1.getShuffleServerInfo(), null);
assertNotEquals(info1, info3);
+ ShuffleRegisterInfo info4 = new ShuffleRegisterInfo(null, info1.getPartitionRanges());
assertNotEquals(info1, info4);
}
diff --git a/common/src/test/java/org/apache/uniffle/common/ShuffleServerInfoTest.java b/common/src/test/java/org/apache/uniffle/common/ShuffleServerInfoTest.java
index dd98a7c..4a8d7a3 100644
--- a/common/src/test/java/org/apache/uniffle/common/ShuffleServerInfoTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/ShuffleServerInfoTest.java
@@ -47,10 +47,10 @@ public class ShuffleServerInfoTest {
@Test
public void testToString() {
ShuffleServerInfo info = new ShuffleServerInfo("1", "localhost", 1234);
- assertEquals("ShuffleServerInfo{id[" + info.getId() +
- "], host[" + info.getHost() +
- "], port[" + info.getPort() +
- "]}", info.toString());
+ assertEquals("ShuffleServerInfo{id[" + info.getId()
+ + "], host[" + info.getHost()
+ + "], port[" + info.getPort()
+ + "]}", info.toString());
}
}
diff --git a/common/src/test/java/org/apache/uniffle/common/config/ConfigOptionTest.java b/common/src/test/java/org/apache/uniffle/common/config/ConfigOptionTest.java
index a3b75ab..547d148 100644
--- a/common/src/test/java/org/apache/uniffle/common/config/ConfigOptionTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/config/ConfigOptionTest.java
@@ -17,6 +17,10 @@
package org.apache.uniffle.common.config;
+import java.util.List;
+import java.util.function.Function;
+
+import com.google.common.collect.Lists;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,11 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import java.util.List;
-import java.util.function.Function;
-
-import com.google.common.collect.Lists;
-
public class ConfigOptionTest {
@Test
@@ -123,6 +122,7 @@ public class ConfigOptionTest {
conf.get(checkLongValsOptions);
fail();
} catch (IllegalArgumentException illegalArgumentException) {
+ // no op
}
conf.set(checkLongValsOptions, Lists.newArrayList(1, 2, 3));
@@ -187,7 +187,9 @@ public class ConfigOptionTest {
final ConfigOption<Integer> positiveInt = ConfigOptions
.key("key5")
.intType()
- .checkValue((v) -> {return v > 0;}, "The value of key5 must be positive")
+ .checkValue((v) -> {
+ return v > 0;
+ }, "The value of key5 must be positive")
.defaultValue(1)
.withDescription("Positive integer key");
RssBaseConf conf = new RssBaseConf();
diff --git a/common/src/test/java/org/apache/uniffle/common/config/RssConfTest.java b/common/src/test/java/org/apache/uniffle/common/config/RssConfTest.java
index a5a568f..dd0d635 100644
--- a/common/src/test/java/org/apache/uniffle/common/config/RssConfTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/config/RssConfTest.java
@@ -17,75 +17,74 @@
package org.apache.uniffle.common.config;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Test;
-
public class RssConfTest {
- @Test
- public void testOptionWithDefault() {
- RssConf cfg = new RssConf();
- cfg.setInteger("int-key", 11);
- cfg.setString("string-key", "abc");
-
- ConfigOption<String> presentStringOption = ConfigOptions
- .key("string-key")
- .stringType()
- .defaultValue("my-beautiful-default");
- ConfigOption<Integer> presentIntOption = ConfigOptions
- .key("int-key")
- .intType()
- .defaultValue(87);
-
- assertEquals("abc", cfg.getString(presentStringOption));
- assertEquals("abc", cfg.getValue(presentStringOption));
-
- assertEquals(11, cfg.getInteger(presentIntOption));
- assertEquals("11", cfg.getValue(presentIntOption));
- }
-
- @Test
- public void testSetStringAndGetConcreteType() {
- RssConf conf = new RssConf();
- conf.setString("boolean-type", "true");
- conf.setString("int-type", "1111");
- conf.setString("long-type", "1000");
- assertTrue(conf.getBoolean("boolean-type", false));
- assertEquals(conf.getInteger("int-type", 100), 1111);
- assertEquals(conf.getLong("long-type", 222L), 1000L);
- }
-
- @Test
- public void testOptionWithNoDefault() {
- RssConf cfg = new RssConf();
- cfg.setInteger("int-key", 11);
- cfg.setString("string-key", "abc");
-
- ConfigOption<String> presentStringOption = ConfigOptions
- .key("string-key")
- .stringType()
- .noDefaultValue();
-
- assertEquals("abc", cfg.getString(presentStringOption));
- assertEquals("abc", cfg.getValue(presentStringOption));
-
- // test getting default when no value is present
-
- ConfigOption<String> stringOption = ConfigOptions
- .key("test")
- .stringType()
- .noDefaultValue();
-
- // getting strings for null should work
- assertNull(cfg.getValue(stringOption));
- assertNull(cfg.getString(stringOption));
-
- // overriding the null default should work
- assertEquals("override", cfg.getString(stringOption, "override"));
- }
-
+ @Test
+ public void testOptionWithDefault() {
+ RssConf cfg = new RssConf();
+ cfg.setInteger("int-key", 11);
+ cfg.setString("string-key", "abc");
+
+ ConfigOption<String> presentStringOption = ConfigOptions
+ .key("string-key")
+ .stringType()
+ .defaultValue("my-beautiful-default");
+ ConfigOption<Integer> presentIntOption = ConfigOptions
+ .key("int-key")
+ .intType()
+ .defaultValue(87);
+
+ assertEquals("abc", cfg.getString(presentStringOption));
+ assertEquals("abc", cfg.getValue(presentStringOption));
+
+ assertEquals(11, cfg.getInteger(presentIntOption));
+ assertEquals("11", cfg.getValue(presentIntOption));
+ }
+
+ @Test
+ public void testSetStringAndGetConcreteType() {
+ RssConf conf = new RssConf();
+ conf.setString("boolean-type", "true");
+ conf.setString("int-type", "1111");
+ conf.setString("long-type", "1000");
+ assertTrue(conf.getBoolean("boolean-type", false));
+ assertEquals(conf.getInteger("int-type", 100), 1111);
+ assertEquals(conf.getLong("long-type", 222L), 1000L);
+ }
+
+ @Test
+ public void testOptionWithNoDefault() {
+ RssConf cfg = new RssConf();
+ cfg.setInteger("int-key", 11);
+ cfg.setString("string-key", "abc");
+
+ ConfigOption<String> presentStringOption = ConfigOptions
+ .key("string-key")
+ .stringType()
+ .noDefaultValue();
+
+ assertEquals("abc", cfg.getString(presentStringOption));
+ assertEquals("abc", cfg.getValue(presentStringOption));
+
+ // test getting default when no value is present
+
+ ConfigOption<String> stringOption = ConfigOptions
+ .key("test")
+ .stringType()
+ .noDefaultValue();
+
+ // getting strings for null should work
+ assertNull(cfg.getValue(stringOption));
+ assertNull(cfg.getString(stringOption));
+
+ // overriding the null default should work
+ assertEquals("override", cfg.getString(stringOption, "override"));
+ }
}
diff --git a/common/src/test/java/org/apache/uniffle/common/metrics/MetricsManagerTest.java b/common/src/test/java/org/apache/uniffle/common/metrics/MetricsManagerTest.java
index 92eded0..8c7fd59 100644
--- a/common/src/test/java/org/apache/uniffle/common/metrics/MetricsManagerTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/metrics/MetricsManagerTest.java
@@ -17,20 +17,21 @@
package org.apache.uniffle.common.metrics;
-import static io.prometheus.client.Collector.MetricFamilySamples;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import io.prometheus.client.CollectorRegistry;
-import io.prometheus.client.Gauge;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
+import io.prometheus.client.CollectorRegistry;
+import io.prometheus.client.Gauge;
import org.junit.jupiter.api.Test;
+import static io.prometheus.client.Collector.MetricFamilySamples;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MetricsManagerTest {
@Test
@@ -43,11 +44,9 @@ public class MetricsManagerTest {
assertEquals(expectedRegistry, metricsManager.getCollectorRegistry());
String expectedName1 = "counter";
- String expectedHelp1 = "Counter " + expectedName1;
metricsManager.addCounter(expectedName1);
String expectedName2 = "name2";
- String expectedHelp2 = "Gauge " + expectedName2;
String label = "gaugeLabel";
Gauge gauge = metricsManager.addGauge(expectedName2, label);
gauge.labels("lv1").inc();
@@ -60,9 +59,11 @@ public class MetricsManagerTest {
metricsSamples.put(cur.name, cur);
}
+ String expectedHelp1 = "Counter " + expectedName1;
assertEquals(expectedHelp1, metricsSamples.get(expectedName1).help);
assertEquals(1, metricsSamples.get(expectedName1).samples.size());
+ String expectedHelp2 = "Gauge " + expectedName2;
assertEquals(expectedHelp2, metricsSamples.get(expectedName2).help);
List<MetricFamilySamples.Sample> f = metricsSamples.get(expectedName2).samples;
assertEquals(2, metricsSamples.get(expectedName2).samples.size());
diff --git a/common/src/test/java/org/apache/uniffle/common/util/ChecksumUtilsTest.java b/common/src/test/java/org/apache/uniffle/common/util/ChecksumUtilsTest.java
index 0883c39..7e24ddf 100644
--- a/common/src/test/java/org/apache/uniffle/common/util/ChecksumUtilsTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/util/ChecksumUtilsTest.java
@@ -17,8 +17,6 @@
package org.apache.uniffle.common.util;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
import java.io.FileOutputStream;
import java.nio.ByteBuffer;
@@ -28,8 +26,11 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Random;
import java.util.zip.CRC32;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ChecksumUtilsTest {
@Test
@@ -64,7 +65,6 @@ public class ChecksumUtilsTest {
outputStream.write(data);
}
- long expectedChecksum = ChecksumUtils.getCrc32(data);
// test direct ByteBuffer
Path path = Paths.get(file.getAbsolutePath());
@@ -74,6 +74,7 @@ public class ChecksumUtilsTest {
fileChannel.close();
assertEquals(length, bytesRead);
buffer.flip();
+ long expectedChecksum = ChecksumUtils.getCrc32(data);
assertEquals(expectedChecksum, ChecksumUtils.getCrc32(buffer));
assertEquals(length, buffer.position());
diff --git a/common/src/test/java/org/apache/uniffle/common/util/ExitUtilsTest.java b/common/src/test/java/org/apache/uniffle/common/util/ExitUtilsTest.java
index 8566401..0735983 100644
--- a/common/src/test/java/org/apache/uniffle/common/util/ExitUtilsTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/util/ExitUtilsTest.java
@@ -17,35 +17,35 @@
package org.apache.uniffle.common.util;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
import org.apache.uniffle.common.util.ExitUtils.ExitException;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class ExitUtilsTest {
@Test
public void test() {
try {
- final int status = -1;
- final String testExitMessage = "testExitMessage";
- try {
- ExitUtils.disableSystemExit();
- ExitUtils.terminate(status, testExitMessage, null, null);
- fail();
- } catch (ExitException e) {
- assertEquals(status, e.getStatus());
- assertEquals(testExitMessage, e.getMessage());
- }
-
- final Thread t = new Thread(null, () -> {
- throw new AssertionError("TestUncaughtException");
- }, "testThread");
- t.start();
- t.join();
- } catch (Exception e) {
+ final int status = -1;
+ final String testExitMessage = "testExitMessage";
+ try {
+ ExitUtils.disableSystemExit();
+ ExitUtils.terminate(status, testExitMessage, null, null);
+ fail();
+ } catch (ExitException e) {
+ assertEquals(status, e.getStatus());
+ assertEquals(testExitMessage, e.getMessage());
+ }
+
+ final Thread t = new Thread(null, () -> {
+ throw new AssertionError("TestUncaughtException");
+ }, "testThread");
+ t.start();
+ t.join();
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/common/src/test/java/org/apache/uniffle/common/util/RssUtilsTest.java b/common/src/test/java/org/apache/uniffle/common/util/RssUtilsTest.java
index c1c95e2..6d8292e 100644
--- a/common/src/test/java/org/apache/uniffle/common/util/RssUtilsTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/util/RssUtilsTest.java
@@ -20,19 +20,19 @@ package org.apache.uniffle.common.util;
import java.lang.reflect.Field;
import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.util.List;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import com.google.common.collect.Lists;
-import org.apache.uniffle.common.ShuffleDataSegment;
-import org.apache.uniffle.common.ShuffleIndexResult;
import org.junit.jupiter.api.Test;
import org.roaringbitmap.longlong.Roaring64NavigableMap;
import org.apache.uniffle.common.BufferSegment;
+import org.apache.uniffle.common.ShuffleDataSegment;
+import org.apache.uniffle.common.ShuffleIndexResult;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git a/common/src/test/java/org/apache/uniffle/common/util/UnitConverterTest.java b/common/src/test/java/org/apache/uniffle/common/util/UnitConverterTest.java
index 558f532..0f39560 100644
--- a/common/src/test/java/org/apache/uniffle/common/util/UnitConverterTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/util/UnitConverterTest.java
@@ -23,11 +23,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnitConverterTest {
- long PB = (long)ByteUnit.PiB.toBytes(1L);
- long TB = (long)ByteUnit.TiB.toBytes(1L);
- long GB = (long)ByteUnit.GiB.toBytes(1L);
- long MB = (long)ByteUnit.MiB.toBytes(1L);
- long KB = (long)ByteUnit.KiB.toBytes(1L);
+ private static final long PB = (long)ByteUnit.PiB.toBytes(1L);
+ private static final long TB = (long)ByteUnit.TiB.toBytes(1L);
+ private static final long GB = (long)ByteUnit.GiB.toBytes(1L);
+ private static final long MB = (long)ByteUnit.MiB.toBytes(1L);
+ private static final long KB = (long)ByteUnit.KiB.toBytes(1L);
@Test
public void testByteString() {
diff --git a/common/src/test/java/org/apache/uniffle/common/web/JettyServerTest.java b/common/src/test/java/org/apache/uniffle/common/web/JettyServerTest.java
index 63dbe80..c2ecb0c 100644
--- a/common/src/test/java/org/apache/uniffle/common/web/JettyServerTest.java
+++ b/common/src/test/java/org/apache/uniffle/common/web/JettyServerTest.java
@@ -17,13 +17,6 @@
package org.apache.uniffle.common.web;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import org.apache.uniffle.common.config.RssBaseConf;
-import org.apache.uniffle.common.util.ExitUtils;
-import org.apache.uniffle.common.util.ExitUtils.ExitException;
import java.io.FileNotFoundException;
import org.eclipse.jetty.server.Handler;
@@ -33,6 +26,14 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.thread.ExecutorThreadPool;
import org.junit.jupiter.api.Test;
+import org.apache.uniffle.common.config.RssBaseConf;
+import org.apache.uniffle.common.util.ExitUtils;
+import org.apache.uniffle.common.util.ExitUtils.ExitException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
public class JettyServerTest {
@Test