From 5215e0b25b13ed4920ac20b9d2393c7c05a58ed3 Mon Sep 17 00:00:00 2001
From: bvosburgh
Date: Fri, 11 Apr 2008 14:17:42 +0000
Subject: [192777] Entity Generation produces fields with Java reserved word
 names

---
 .../jpt/utility/tests/internal/NameToolsTests.java      | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'jpa/tests')

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);
+
 	}
 
 }
-- 
cgit v1.2.3