Refactor String model class #119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Is there a way to test this code? |
The value for java.lang.String#COMPACT_STRINGS is injected by JVM. If it is set to false, bytes in value are always encoded in UTF16. This also fixes javapathfinder#118: [junit] java.lang.NoSuchFieldError: java.lang.String.COMPACT_STRINGS
Currently String#contentEquals(java.lang.CharSequence) implementation
only handles if the bytes in the String value are UTF16 encoded. If not
it throws an assertion error like the following:
[junit] java.lang.AssertionError: Currently only UTF16 is supported for String comparision with an instance of type AbstractStringBuilder
[junit] at java.lang.String.contentEquals(String.java:275)
[junit] at gov.nasa.jpf.test.java.lang.StringTest.testContentEquals(StringTest.java:301)
[junit] at java.lang.reflect.Method.invoke(gov.nasa.jpf.vm.JPF_java_lang_reflect_Method)
[junit] at gov.nasa.jpf.util.test.TestJPF.runTestMethod(TestJPF.java:648)
This updates String#contentEquals(java.lang.CharSequence) method, so it
handles both LATIN1 and UTF16 encoded Strings.
java.lang.String#hash should only need assign when using the constructor String#String(java.lang.String)
|
You may test it with the JUnit test class StringTest. First two commits 9fad766 and ed880f4 each addresses specific errors which you may find if you run the StringTest with showoutput parameter set to on. I separate this to smaller commits, so it becomes easier to review. |
|
Gayan Weerakutti wrote:
You may test it with the JUnit test class StringTest. First two commits
9fad766
<9fad766>
and ed880f4
<ed880f4>
both addresses specific errors which you may find if you run the StringTest
with |[showoutput]|parameter
(https://github.com/javapathfinder/jpf-core/blob/2f9705fd3ada60189d7aca9ef1a92ba73e500635/build.xml#L451)
set to |on|.
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#119 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AG9eR0GqPfxAeJDkbQ4jkxhu-sAnLZ3kks5uJcRJgaJpZM4VZ8Yh>.
Thanks for clarifying; I've merged the PR and closed the issue now.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This refactors String model class based on JDK 10.0.1 source.
Add support for JEP 254: Compact Strings, which fixes NoSuchFieldError: String.COMPACT_STRINGS #118
Refactor String#contentEquals(java.lang.CharSequence) as the current implementation only handles UTF16