Skip to content
This repository was archived by the owner on Mar 31, 2023. It is now read-only.

[Node Manager] Junit test with MockIgniteServer #201

Merged
merged 15 commits into from
May 21, 2020
Merged

[Node Manager] Junit test with MockIgniteServer #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1645a53
[Micro services] MAC manager
kimeunju108 May 9, 2020
a036012
[Micro services] MAC manager - updated pom.xml
kimeunju108 May 14, 2020
d03f84e
[Micro services] MAC manager - updated pom.xml & configuration
kimeunju108 May 14, 2020
250783f
Merge branch 'master' of https://github.com/futurewei-cloud/alcor
kimeunju108 May 14, 2020
1e28444
Merge branch 'master' into eunju/macmanager
kimeunju108 May 14, 2020
b321524
[Micro serices] MAC manager - add config file
kimeunju108 May 14, 2020
bbd4686
Merge branch 'master' of https://github.com/kimeunju108/alcor into eu…
kimeunju108 May 14, 2020
8e67eab
[Micro services] MAC manager - moved swagger config to config package
kimeunju108 May 14, 2020
7ba14ad
[Micro services] MAC manager - moved swagger config to config package
kimeunju108 May 14, 2020
ec5b631
Merge branch 'master' of https://github.com/kimeunju108/alcor into eu…
kimeunju108 May 14, 2020
dc7677f
[Micro services] MAC manager - removed duplicated dependency
kimeunju108 May 14, 2020
e9b82d8
Merge branch 'master' of https://github.com/kimeunju108/alcor
kimeunju108 May 14, 2020
875f1d4
Merge branch 'master' of https://github.com/futurewei-cloud/alcor
kimeunju108 May 15, 2020
1338458
Merge branch 'master' of https://github.com/futurewei-cloud/alcor
kimeunju108 May 16, 2020
67dee63
[Micro services] Node manager - update UTs configuration with MockIgn…
kimeunju108 May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion services/node_manager/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#redis configuration
spring.redis.host=localhost
spring.redis.port=6380
#ignite configuration
ignite.host=localhost
ignite.port=10800
ignite.port=10801
ignite.key-store-path=keystore.jks
ignite.key-store-password=123456
ignite.trust-store-path=truststore.jks
Expand Down
15 changes: 9 additions & 6 deletions ..._manager/src/test/java/com/futurewei/alcor/nodemanager/controller/NodeControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.futurewei.alcor.nodemanager.controller;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.futurewei.alcor.common.db.ignite.MockIgniteServer;
import com.futurewei.alcor.common.exception.ParameterUnexpectedValueException;
import com.futurewei.alcor.nodemanager.service.NodeService;
import com.futurewei.alcor.web.entity.NodeInfo;
Expand All @@ -35,15 +36,17 @@
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;

import static org.junit.Assert.assertTrue;
import java.util.Objects;

import static org.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

@RunWith(SpringRunner.class)
@SpringBootTest()
@AutoConfigureMockMvc
public class NodeControllerTest {
public class NodeControllerTest extends MockIgniteServer {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the node manager UTs currently need MockIgniteServer as it doesn't have real e2e test cases. But it is okay to add in advance so that you could add more e2e UTs in the future.

private static final ObjectMapper om = new ObjectMapper();
@MockBean
NodeService service;
Expand Down Expand Up @@ -125,7 +128,7 @@ public void test_createNodeInfo_invalidInputNull() throws Exception {
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON))
.andDo(print())
.andExpect(status().isBadRequest())
.andExpect((rslt) -> assertTrue(rslt.getResolvedException().getClass() != null));
.andExpect((rslt) -> assertNotNull(Objects.requireNonNull(rslt.getResolvedException()).getClass()));
}

@Test
Expand Down Expand Up @@ -182,7 +185,7 @@ public void test_getNodeInfoByNodeId_invalidId() throws Exception {
MvcResult result = this.mockMvc.perform(get("/nodes/" + strNodeId))
.andDo(print())
.andReturn();
assertTrue(result.getResponse().getContentAsString().length() == 0);
assertEquals(0, result.getResponse().getContentAsString().length());
}

@Test
Expand All @@ -193,7 +196,7 @@ public void deleteNodeInfo() throws Exception {
.andDo(print())
.andExpect(status().isOk())
.andReturn();
assertTrue(result.getResponse().getContentAsString().equals(strNodeId));
assertEquals(result.getResponse().getContentAsString(), strNodeId);
}

@Test
Expand All @@ -202,6 +205,6 @@ public void deleteNodeInfo_invalidId() throws Exception {
MvcResult result = this.mockMvc.perform(delete("/nodes/" + strNodeId))
.andDo(print())
.andReturn();
assertTrue(result.getResponse().getContentAsString().length() == 0);
assertEquals(0, result.getResponse().getContentAsString().length());
}
}