Fix test case NamespaceServiceTest.testFindNamespace() (#4491)

apolloconfig · Jul 31, 2022 · 63c16c1 · 63c16c1
1 parent 4272471
commit 63c16c1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java b/...-portal/src/test/java/com/ctrip/framework/apollo/portal/service/NamespaceServiceTest.java
@@ -30,6 +30,7 @@
 import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
 import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
 
+import org.assertj.core.util.Lists;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -120,6 +121,10 @@ public void testFindNamespace() {
 
     List<NamespaceBO> namespaceVOs = namespaceService.findNamespaceBOs(testAppId, Env.DEV, testClusterName);
     assertEquals(2, namespaceVOs.size());
+
+    when(namespaceAPI.findNamespaceByCluster(testAppId, Env.DEV, testClusterName)).thenReturn(Lists.list(application));
+    namespaceVOs = namespaceService.findNamespaceBOs(testAppId, Env.DEV, testClusterName);
+    assertEquals(1, namespaceVOs.size());
     NamespaceBO namespaceVO = namespaceVOs.get(0);
     assertEquals(4, namespaceVO.getItems().size());
     assertEquals("a", namespaceVO.getItems().get(0).getItem().getKey());
@@ -129,12 +134,11 @@ public void testFindNamespace() {
     assertEquals(testNamespaceName, namespaceVO.getBaseInfo().getNamespaceName());
 
     ReleaseDTO errorRelease = new ReleaseDTO();
-    someRelease.setConfigurations("\"a\":\"123\",\"b\":\"123\"");
-    when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName, "hermes")).thenReturn(errorRelease);
+    errorRelease.setConfigurations("\"a\":\"123\",\"b\":\"123\"");
+    when(releaseService.loadLatestRelease(testAppId, Env.DEV, testClusterName, testNamespaceName)).thenReturn(errorRelease);
     assertThatExceptionOfType(RuntimeException.class)
         .isThrownBy(()-> namespaceService.findNamespaceBOs(testAppId, Env.DEV, testClusterName))
-        .withMessageContaining("hermes", testNamespaceName)
-        .withMessageStartingWith("Parse namespaces error, expected: 2, but actual: 0, cannot get those namespaces: ");
+        .withMessageStartingWith("Parse namespaces error, expected: 1, but actual: 0, cannot get those namespaces: [application]");
 
   }