diff options
author | Tor Norbye <tnorbye@google.com> | 2014-05-29 12:58:43 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-05-29 13:11:55 -0700 |
commit | 2a94f2be2b72a96ac100e4db28d7f630aeb3a887 (patch) | |
tree | ad3a5206eb31cb875686b16c82f914437035acc2 /android/testData/dom | |
parent | ee517cb855970fc4f89d82fced4868a93bed0801 (diff) | |
download | idea-2a94f2be2b72a96ac100e4db28d7f630aeb3a887.tar.gz |
In XML validation, flag resource names that are Java keywords
Also use the resource name validator when creating validation error
messages such that the message are more specific (e.g. listing the
specific character that isn't allowed, or whether the string is
a keyword, or whether the character is not allowed as the first
character, etc.)
Change-Id: I94ef022006738038218deb4343b4b52b4bcc298b
Diffstat (limited to 'android/testData/dom')
-rw-r--r-- | android/testData/dom/resources/nameValidation.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android/testData/dom/resources/nameValidation.xml b/android/testData/dom/resources/nameValidation.xml index acf5c477d4a..cf5a2633353 100644 --- a/android/testData/dom/resources/nameValidation.xml +++ b/android/testData/dom/resources/nameValidation.xml @@ -1,9 +1,11 @@ <resources> - <string name="<error>1a</error>">a</string> + <string name="<error descr="The resource name must begin with a character">1a</error>">a</string> <string name="a1">a</string> - <item name="<error>**</error>">a</item> - <integer name="<error>a b</error>">1</integer> + <item name="<error descr="The resource name must begin with a character">**</error>">a</item> + <integer name="<error descr="' ' is not a valid resource name character">a b</error>">1</integer> <integer name="a_b">1</integer> <string name="a-b">1</string> <string name="a.b">1</string> -</resources>
\ No newline at end of file + <string name="<error descr="assert is not a valid name (reserved Java keyword)">assert</error>">a</string> + <string name="<error descr="new is not a valid name (reserved Java keyword)">new</error>">a</string> +</resources> |