Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa/tests
diff options
context:
space:
mode:
authorbvosburgh2008-04-11 14:17:42 +0000
committerbvosburgh2008-04-11 14:17:42 +0000
commit5215e0b25b13ed4920ac20b9d2393c7c05a58ed3 (patch)
treec40f43dfe6bdd2b7d2a202bf0d83f4b39b6f6b1a /jpa/tests
parent21a1437ea78a7001b5e61a0d472e3a0ae72f333b (diff)
downloadwebtools.dali-5215e0b25b13ed4920ac20b9d2393c7c05a58ed3.tar.gz
webtools.dali-5215e0b25b13ed4920ac20b9d2393c7c05a58ed3.tar.xz
webtools.dali-5215e0b25b13ed4920ac20b9d2393c7c05a58ed3.zip
[192777] Entity Generation produces fields with Java reserved word names
Diffstat (limited to 'jpa/tests')
-rw-r--r--jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/NameToolsTests.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/NameToolsTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/NameToolsTests.java
index 164fa49e03..52b30b49c3 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/NameToolsTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/NameToolsTests.java
@@ -173,7 +173,8 @@ public class NameToolsTests extends TestCase {
public void testconvertToJavaIdentifierString() {
assertEquals("foo", NameTools.convertToJavaIdentifier("foo"));
assertEquals("foo1", NameTools.convertToJavaIdentifier("foo1"));
- assertEquals("Private", NameTools.convertToJavaIdentifier("private"));
+ assertEquals("private_", NameTools.convertToJavaIdentifier("private"));
+ assertEquals("throw_", NameTools.convertToJavaIdentifier("throw"));
assertEquals("_foo", NameTools.convertToJavaIdentifier("1foo"));
assertEquals("foo_", NameTools.convertToJavaIdentifier("foo%"));
assertEquals("foo__bar__", NameTools.convertToJavaIdentifier("foo bar "));
@@ -182,7 +183,8 @@ public class NameToolsTests extends TestCase {
public void testconvertToJavaIdentifierStringChar() {
assertEquals("foo", NameTools.convertToJavaIdentifier("foo", '$'));
assertEquals("foo1", NameTools.convertToJavaIdentifier("foo1", '$'));
- assertEquals("Private", NameTools.convertToJavaIdentifier("private", '$'));
+ assertEquals("private$", NameTools.convertToJavaIdentifier("private", '$'));
+ assertEquals("throwss", NameTools.convertToJavaIdentifier("throw", 's'));
assertEquals("$foo", NameTools.convertToJavaIdentifier("1foo", '$'));
assertEquals("foo$", NameTools.convertToJavaIdentifier("foo%", '$'));
assertEquals("foo$$bar$$", NameTools.convertToJavaIdentifier("foo bar ", '$'));
@@ -209,6 +211,17 @@ public class NameToolsTests extends TestCase {
}
assertTrue(exCaught);
+ exCaught = false;
+ try {
+ String s = NameTools.convertToJavaIdentifier("private", '^');
+ fail("invalid string: \"" + s + "\"");
+ } catch (IllegalArgumentException ex) {
+ if (ex.getMessage().indexOf('^') != -1) {
+ exCaught = true;
+ }
+ }
+ assertTrue(exCaught);
+
}
}

Back to the top