Feature/dynamic deck dynamo prod #2
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
davidjgonzalez
commented
Apr 30, 2020
| @@ -41,8 +41,11 @@ | |||
| @Override | |||
| public Map<String, String> getOptions() { | |||
| Map<String, String> options = new LinkedHashMap<>(); | |||
| ResourceResolver resourceResolver = getHelper().getRequest().getResourceResolver(); | |||
| if (null != resourceResolver) { | |||
| if (null != getHelper() && | |||
There was a problem hiding this comment.
getHelper() returned null in the "unrelated" DialogResourceProviderFactoryTest
davidjgonzalez
commented
Apr 30, 2020
| @@ -24,7 +24,7 @@ | |||
| import org.osgi.service.component.annotations.Component; | |||
| import org.osgi.service.metatype.annotations.Designate; | |||
|
|
|||
| @Component(service = DynamicDeckConfigurationService.class) | |||
| @Component(service = DynamicDeckConfigurationService.class, immediate = true) | |||
There was a problem hiding this comment.
I guess we can leave this - but you definitely shouldn't need it to slingscripthelper to get the service... might be something weird going on w/ the MCP forms
davidjgonzalez
commented
Apr 30, 2020
| import org.mockito.invocation.InvocationOnMock; | ||
| import org.mockito.stubbing.Answer; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import sun.rmi.runtime.Log; |
There was a problem hiding this comment.
Cleaned up these deps as my local didn't like running this tests with sun.rmi...
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.
Fixed issue with failing test