Skip to content

Commit 91373b0

Browse files
authored
Merge pull request #352 from domaframework/escape-quotation
Escape a single quotation to make format success
2 parents 28605ff + 3eb53db commit 91373b0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/main/java/org/seasar/doma/message/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public enum Message implements MessageResource {
1414
DOMA0001("The parameter \"{0}\" is null"),
1515
DOMA0002("The parameter \"{0}\" is illegal. The cause is as follows: {1}"),
1616
DOMA0003(
17-
"The version of Doma's jar file is different between runtime and compile-time (runtime={0}, compile-time={1}). "
17+
"The version of Doma''s jar file is different between runtime and compile-time (runtime={0}, compile-time={1}). "
1818
+ "If you use Eclipse, check the Build path and the Factory path. "
1919
+ "Otherwise if you use javac, check the classpath option and the processorpath option. "
2020
+ "In the case of Web application, check whether there is no old jar file in WEB-INF/lib directory."),

src/test/java/org/seasar/doma/internal/ArtifactTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.seasar.doma.internal;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
45
import static org.junit.jupiter.api.Assertions.assertNotNull;
56
import static org.junit.jupiter.api.Assertions.fail;
67

@@ -31,6 +32,7 @@ public void testValidateVersion_conflicted() throws Exception {
3132
fail();
3233
} catch (DomaException expected) {
3334
System.out.println(expected.getMessage());
35+
assertFalse(expected.getMessage().contains("{"));
3436
}
3537
}
3638
}

0 commit comments

Comments
 (0)