refactor(auth api): fix test error

Author: spaceluke

apollo-portal/src/test/java/com/ctrip/framework/apollo/SkipAuthorizationConfiguration.java

@@ -42,7 +42,7 @@ public class SkipAuthorizationConfiguration {
   @Bean
   public ConsumerPermissionValidator consumerPermissionValidator() {
     final ConsumerPermissionValidator mock = mock(ConsumerPermissionValidator.class);
-    when(mock.hasCreateNamespacePermission(any(), any())).thenReturn(true);
+    when(mock.hasCreateNamespacePermission(any())).thenReturn(true);
     return mock;
   }
 
@@ -61,7 +61,7 @@ public ConsumerAuthUtil consumerAuthUtil() {
   }
 
   @Primary
-  @Bean("permissionValidator")
+  @Bean("userPermissionValidator")
   public UserPermissionValidator permissionValidator() {
     final UserPermissionValidator mock = mock(UserPermissionValidator.class);
     when(mock.isSuperAdmin()).thenReturn(true);

apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/v1/controller/AppControllerTest.java

@@ -107,7 +107,7 @@ public class AppControllerTest {
   @Test
   public void testFindAppsAuthorized() throws Exception {
     final long consumerId = 123456;
-    Mockito.when(this.consumerAuthUtil.retrieveConsumerId(Mockito.any())).thenReturn(consumerId);
+    Mockito.when(this.consumerAuthUtil.retrieveConsumerIdByCtx()).thenReturn(consumerId);
 
     final List<ConsumerRole> consumerRoles = Arrays.asList(
         generateConsumerRoleByRoleId(6),

apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/v1/controller/NamespaceControllerTest.java

@@ -39,7 +39,7 @@ public class NamespaceControllerTest extends AbstractControllerTest {
 
   @Test
   public void shouldFailWhenAppNamespaceNameIsInvalid() {
-    Assert.assertTrue(consumerPermissionValidator.hasCreateNamespacePermission(null, null));
+    Assert.assertTrue(consumerPermissionValidator.hasCreateNamespacePermission(null));
 
     OpenAppNamespaceDTO dto = new OpenAppNamespaceDTO();
     dto.setAppId("appId");