Skip to content

Commit b4e566f

Browse files
style: align SubscriptionModeConverter and add tests for invalid values
1 parent c601289 commit b4e566f

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public class SubscriptionModeConverter implements Converter<String, Subscription
2626
@Override
2727
public SubscriptionMode convert(String value) {
2828
if(value==null || value.trim().isEmpty()){
29-
return null;
29+
return SubscriptionMode.UNRECOGNIZED;
3030
}
3131
try{
3232
return SubscriptionMode.valueOf(value.trim().toUpperCase());
3333
}catch (IllegalArgumentException e ){
34-
return null;
34+
return SubscriptionMode.UNRECOGNIZED;
3535
}
3636
}
3737

eventmesh-common/src/test/java/org/apache/eventmesh/common/protocol/SubscriptionModeConverterTest.java

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,45 @@
22

33
import org.junit.jupiter.api.Test;
44

5-
import static org.junit.jupiter.api.Assertions.*;
5+
import static org.junit.jupiter.api.Assertions.assertEquals;
66

77
public class SubscriptionModeConverterTest {
88

9-
private final SubscriptionModeConverter converter =
10-
new SubscriptionModeConverter();
9+
private final SubscriptionModeConverter converter = new SubscriptionModeConverter();
1110

1211
@Test
13-
public void testNullValue() {
14-
assertNull(converter.convert(null));
12+
public void testValidBroadcasting() {
13+
SubscriptionMode result = converter.convert("BROADCASTING");
14+
assertEquals(SubscriptionMode.BROADCASTING, result);
1515
}
1616

1717
@Test
18-
public void testEmptyValue() {
19-
assertNull(converter.convert(""));
18+
public void testValidClusteringLowerCase() {
19+
SubscriptionMode result = converter.convert("clustering");
20+
assertEquals(SubscriptionMode.CLUSTERING, result);
2021
}
2122

2223
@Test
23-
public void testInvalidValue() {
24-
assertNull(converter.convert("invalid_value"));
24+
public void testValidWithSpaces() {
25+
SubscriptionMode result = converter.convert(" broadcasting ");
26+
assertEquals(SubscriptionMode.BROADCASTING, result);
2527
}
2628

2729
@Test
28-
public void testLowerCaseValue() {
29-
assertEquals(
30-
SubscriptionMode.CLUSTERING,
31-
converter.convert("clustering")
32-
);
30+
public void testNullValue() {
31+
SubscriptionMode result = converter.convert(null);
32+
assertEquals(SubscriptionMode.UNRECOGNIZED, result);
3333
}
3434

3535
@Test
36-
public void testUpperCaseValue() {
37-
assertEquals(
38-
SubscriptionMode.BROADCASTING,
39-
converter.convert("BROADCASTING")
40-
);
36+
public void testEmptyValue() {
37+
SubscriptionMode result = converter.convert("");
38+
assertEquals(SubscriptionMode.UNRECOGNIZED, result);
39+
}
40+
41+
@Test
42+
public void testInvalidValue() {
43+
SubscriptionMode result = converter.convert("invalid_value");
44+
assertEquals(SubscriptionMode.UNRECOGNIZED, result);
4145
}
4246
}

0 commit comments

Comments
 (0)