MULE-12482: Fix test broken by DW (#4)

mulesoft · May 16, 2017 · dc8c7de · dc8c7de
1 parent 08fbaab
commit dc8c7de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ava/org/mule/test/oauth2/internal/authorizationcode/state/ConfigOAuthContextTestCase.java b/...ava/org/mule/test/oauth2/internal/authorizationcode/state/ConfigOAuthContextTestCase.java
@@ -10,6 +10,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.mule.extension.oauth2.internal.authorizationcode.state.ConfigOAuthContext;
 import org.mule.runtime.api.lock.LockFactory;
@@ -19,7 +20,6 @@
 
 import org.junit.Test;
 import org.mockito.Answers;
-import org.mockito.Mockito;
 
 @SmallTest
 public class ConfigOAuthContextTestCase extends AbstractMuleTestCase {
@@ -31,7 +31,7 @@ public class ConfigOAuthContextTestCase extends AbstractMuleTestCase {
 
   @Test
   public void nonExistentUserIdReturnNewConfig() throws Exception {
-    Mockito.when(mockObjectStore.contains(anyString())).thenReturn(false);
+    when(mockObjectStore.contains(anyString())).thenReturn(false);
     assertThat(new ConfigOAuthContext(mockLockFactory, mockObjectStore, TEST_CONFIG_NAME).getContextForResourceOwner(USER_ID),
                notNullValue());
   }

diff --git a/src/test/resources/authorization-code/authorization-code-multitenant-config.xml b/src/test/resources/authorization-code/authorization-code-multitenant-config.xml
@@ -20,7 +20,7 @@
                         externalCallbackUrl="${local.callback.url}"
                         localAuthorizationUrlResourceOwnerId="#[attributes.queryParams.userId]"
                         tokenManager="tokenManagerConfig"
-                        state="#[attributes.queryParams.state when attributes.queryParams.state != null otherwise '']"
+                        state="#[if (attributes.queryParams.state != null) attributes.queryParams.state else '']"
                         localAuthorizationUrl="${local.authorization.url}"
                         authorizationUrl="${authorization.url}"
                         tokenUrl="${token.url}">