#1064 add default value for static fields to make it easier to write … #1065
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
…ier to write pure unit tests: * Play.configuration * Play.id * Play.javaPath * Play.applicationPath * Play.mode * Play.templatesPath * Play.modulesRoutes * Messages.defaults
xael-fry
approved these changes
Dec 27, 2016
| @@ -107,7 +107,7 @@ public static String getMessage(String locale, Object key, Object... args) { | |||
| if (value == null && locale != null && locale.length() == 5 && locales.containsKey(locale.substring(0, 2))) { | |||
| value = locales.get(locale.substring(0, 2)).getProperty(key.toString()); | |||
| } | |||
| if (value == null && defaults != null) { | |||
| if (value == null) { | |||
There was a problem hiding this comment.
I think you should keep the test default != null as defaults is public it can be set to null outside the class
| @@ -196,7 +196,7 @@ public static Properties all(String locale) { | |||
| return defaults; | |||
| Properties mergedMessages = new Properties(); | |||
| mergedMessages.putAll(defaults); | |||
| if (locale != null && locale.length() == 5 && locales.containsKey(locale.substring(0, 2))) { | |||
| if (locale.length() == 5 && locales.containsKey(locale.substring(0, 2))) { | |||
There was a problem hiding this comment.
I think you should keep the test locale != null as locale is public it can be set to null outside the class
| @@ -196,7 +196,7 @@ public static Properties all(String locale) { | |||
| return defaults; | |||
| Properties mergedMessages = new Properties(); | |||
| mergedMessages.putAll(defaults); | |||
| if (locale != null && locale.length() == 5 && locales.containsKey(locale.substring(0, 2))) { | |||
| if (locale.length() == 5 && locales.containsKey(locale.substring(0, 2))) { | |||
| mergedMessages.putAll(locales.get(locale.substring(0, 2))); | |||
| } | |||
| mergedMessages.putAll(locales.get(locale)); | |||
There was a problem hiding this comment.
We should as test on locale before using it
asolntsev
added a commit
to codeborne/play-web
that referenced
this pull request
Dec 27, 2016
it's not needed anymore in Play 1.4.x because of playframework/play1#1065
asolntsev
added a commit
to codeborne/play-liquibase
that referenced
this pull request
Dec 27, 2016
it's not needed anymore in Play 1.4.x because of playframework/play1#1065
asolntsev
added a commit
to codeborne/play-rebel
that referenced
this pull request
Dec 30, 2016
it's not needed anymore in Play 1.4.x because of playframework/play1#1065
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.
…pure unit tests:
(PR for issue #1064)