-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix ContextB application in cleared #255
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,8 +60,8 @@ | |
cleared = StringContext.NAME, | ||
unchanged = TRANSACTION) | ||
@ContextServiceDefinition(name = "java:module/concurrent/ContextB", | ||
cleared = TRANSACTION, | ||
unchanged = { APPLICATION, IntContext.NAME }, | ||
cleared = {TRANSACTION, APPLICATION}, | ||
unchanged = { IntContext.NAME }, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Making this change would only correct the assertion on APPLICATION context and not the subsequent assertion on IntContext. Also, is it safe with respect to all of the other TCK tests that use "java:module/concurrent/ContextB" to alter this configuration? It seems like the safest change would be to either adjust the assertions to match the specified annotation values, or otherwise create an additional ContextServiceDefinition with values that the assertions expect. |
||
propagated = ALL_REMAINING) | ||
@ContextServiceDefinition(name = "java:comp/concurrent/ContextC") | ||
@WebServlet("/ContextServiceDefinitionServlet") | ||
|
@@ -407,7 +407,7 @@ public void testContextualFunction() throws Throwable { | |
|
||
Object[] results = future.get(MAX_WAIT_SECONDS, TimeUnit.SECONDS); | ||
assertTrue(results[0] instanceof NamingException, | ||
"Application context must remain unchanged on contextual Function " + | ||
"Application context must be cleared on contextual Function " + | ||
"per java:module/concurrent/ContextB configuration. Result: " + results[0]); | ||
assertEquals(results[1], Integer.valueOf(0), | ||
"Third-party context type IntContext must remain unchanged on contextual Function " + | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment seems out of place given that this pull is attempting to correct the assertion on results[0] to make it valid.