Skip to content

Commit f2e42d6

Browse files
author
Dennis Labordus
committed
Fixed code smell from Sonar
Signed-off-by: Dennis Labordus <[email protected]>
1 parent 7e15275 commit f2e42d6

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandlerTest.java

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.List;
1212

1313
import static org.junit.jupiter.api.Assertions.assertEquals;
14-
import static org.junit.jupiter.api.Assertions.assertNull;
1514
import static org.lfenergy.compas.scl.validator.xsd.XSDErrorHandler.DEFAULT_PREFIX;
1615
import static org.lfenergy.compas.scl.validator.xsd.XSDErrorHandler.DEFAULT_RULE_NAME;
1716

@@ -63,31 +62,27 @@ private void assertValidationError(ValidationError validationError, String messa
6362

6463
@Test
6564
void getRuleName_WhenXSDMessageIsNull_ThenDefaultXSDRuleNameReturned() {
66-
var ruleName = handler.getRuleName(null);
67-
68-
assertEquals(DEFAULT_RULE_NAME, ruleName);
65+
executeTest_getRuleName_WhereResultIsDefaultRuleName(null);
6966
}
7067

7168
@Test
7269
void getRuleName_WhenXSDMessageIsBlank_ThenDefaultXSDRuleNameReturned() {
73-
var ruleName = handler.getRuleName("");
74-
75-
assertEquals(DEFAULT_RULE_NAME, ruleName);
70+
executeTest_getRuleName_WhereResultIsDefaultRuleName("");
7671
}
7772

7873
@Test
7974
void getRuleName_WhenXSDMessageContainsNoRule_ThenDefaultXSDRuleNameReturned() {
80-
var xsdMessage = "Duplicate match in scope for field \"depth\"";
81-
82-
var ruleName = handler.getRuleName(xsdMessage);
83-
84-
assertEquals(DEFAULT_RULE_NAME, ruleName);
75+
executeTest_getRuleName_WhereResultIsDefaultRuleName(
76+
"Duplicate match in scope for field \"depth\"");
8577
}
8678

8779
@Test
8880
void getRuleName_WhenXSDMessageContainsRuleWithSpaces_ThenDefaultXSDRuleNameReturned() {
89-
var xsdMessage = "SOME SPACES RULE: Duplicate match in scope for field \"depth\"";
81+
executeTest_getRuleName_WhereResultIsDefaultRuleName(
82+
"SOME SPACES RULE: Duplicate match in scope for field \"depth\"");
83+
}
9084

85+
private void executeTest_getRuleName_WhereResultIsDefaultRuleName(String xsdMessage) {
9186
var ruleName = handler.getRuleName(xsdMessage);
9287

9388
assertEquals(DEFAULT_RULE_NAME, ruleName);
@@ -106,33 +101,25 @@ void getRuleName_WhenXSDMessageContainsRule_ThenRuleNameReturned() {
106101

107102
@Test
108103
void getMessage_WhenXSDMessageIsNull_ThenNullReturned() {
109-
var message = handler.getMessage(null);
110-
111-
assertNull(message);
104+
executeTest_GetMessage_WhereInputIsResult(null);
112105
}
113106

114107
@Test
115108
void getMessage_WhenXSDMessageIsBlank_ThenBlankMessageReturned() {
116-
var xsdMessage = " ";
117-
118-
var message = handler.getMessage(xsdMessage);
119-
120-
assertEquals(xsdMessage, message);
109+
executeTest_GetMessage_WhereInputIsResult(" ");
121110
}
122111

123112
@Test
124113
void getMessage_WhenXSDMessageContainsNoRule_ThenOriginalMessageReturned() {
125-
var xsdMessage = "Duplicate match in scope for field \"depth\"";
126-
127-
var message = handler.getMessage(xsdMessage);
128-
129-
assertEquals(xsdMessage, message);
114+
executeTest_GetMessage_WhereInputIsResult("Duplicate match in scope for field \"depth\"");
130115
}
131116

132117
@Test
133118
void getMessage_WhenXSDMessageContainsRuleWithSpaces_ThenOriginalMessageReturned() {
134-
var xsdMessage = "SOME SPACES RULE: Duplicate match in scope for field \"depth\"";
119+
executeTest_GetMessage_WhereInputIsResult("SOME SPACES RULE: Duplicate match in scope for field \"depth\"");
120+
}
135121

122+
private void executeTest_GetMessage_WhereInputIsResult(String xsdMessage) {
136123
var message = handler.getMessage(xsdMessage);
137124

138125
assertEquals(xsdMessage, message);

0 commit comments

Comments
 (0)