Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public void testPartitionRange() {
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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@

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;
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.List;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -31,24 +32,24 @@ public void testToString() {
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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.List;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertFalse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,11 +71,11 @@ public void testNotEquals(int length, long crc, long blockId, int dataSize) {
@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());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.util.Collections;
import java.util.List;

import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -32,15 +33,15 @@ public void testEquals() {
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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public void testEquals() {
@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());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,11 +30,6 @@
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
Expand Down Expand Up @@ -123,6 +122,7 @@ public void testListTypes() {
conf.get(checkLongValsOptions);
fail();
} catch (IllegalArgumentException illegalArgumentException) {
// no op
}

conf.set(checkLongValsOptions, Lists.newArrayList(1, 2, 3));
Expand Down Expand Up @@ -187,7 +187,9 @@ public void testBasicTypes() {
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();
Expand Down
Loading