Skip to content

Commit 8578bf5

Browse files
committed
Update exception message to precise space is allowed in the wild card
Signed-off-by: CARON Alice <[email protected]>
1 parent e8e62a6 commit 8578bf5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contingency/contingency-api/src/test/java/com/powsybl/contingency/NetworkElementIdentifierContingencyListTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ void testUnknownCharacterIdentifier() {
205205
String message = Assertions.assertThrows(PowsyblException.class, () -> new IdWithWildcardsNetworkElementIdentifier("NHV1_NHV2_?_?_?_?_?_?_?")).getMessage();
206206
Assertions.assertEquals("There can be a maximum of 5 wildcards ('?')", message);
207207
String message2 = Assertions.assertThrows(PowsyblException.class, () -> new IdWithWildcardsNetworkElementIdentifier("NHV1_NHV2_ç")).getMessage();
208-
Assertions.assertEquals("Only characters allowed for this identifier are letters, numbers, '_', '-', '.' and the wildcard character '?'", message2);
208+
Assertions.assertEquals("Only characters allowed for this identifier are letters, numbers, '_', '-', '.', spaces and the wildcard character '?'", message2);
209209
NetworkElementIdentifier elementIdentifier = new IdWithWildcardsNetworkElementIdentifier("NHV1_NHV?_?");
210210
Network network = EurostagTutorialExample1Factory.create();
211211
List<String> identifiables = elementIdentifier.filterIdentifiable(network).stream().map(Identifiable::getId).toList();

iidm/iidm-api/src/main/java/com/powsybl/iidm/network/identifiers/IdWithWildcardsNetworkElementIdentifier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void initialize() {
5050
String allowedCharactersRegex = "^[A-Za-z0-9_? .-]*$";
5151

5252
if (!identifier.matches(allowedCharactersRegex)) {
53-
throw new PowsyblException("Only characters allowed for this identifier are letters, numbers, '_', '-', '.' and the wildcard character '?'");
53+
throw new PowsyblException("Only characters allowed for this identifier are letters, numbers, '_', '-', '.', spaces and the wildcard character '?'");
5454
}
5555
int separatorNumber = StringUtils.countMatches(identifier, WILDCARD);
5656
if (separatorNumber > ALLOWED_WILDCARDS_NUMBER) {

0 commit comments

Comments
 (0)