Skip to content

Fix failing unit tests #3415

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 26, 2025
Merged

Fix failing unit tests #3415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions .../phoebus/service/saveandrestore/web/controllers/ConfigurationControllerPermitAllTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
package org.phoebus.service.saveandrestore.web.controllers;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.phoebus.applications.saveandrestore.model.Configuration;
import org.phoebus.applications.saveandrestore.model.ConfigurationData;
import org.phoebus.applications.saveandrestore.model.Node;
Expand Down Expand Up @@ -70,11 +72,14 @@ public class ConfigurationControllerPermitAllTest {
@Autowired
private String demoUser;

@AfterEach
public void resetMocks(){
reset(nodeDAO);
}

@Test
public void testCreateConfiguration() throws Exception {

reset(nodeDAO);

Configuration configuration = new Configuration();
configuration.setConfigurationNode(Node.builder().build());
ConfigurationData configurationData = new ConfigurationData();
Expand All @@ -84,6 +89,9 @@ public void testCreateConfiguration() throws Exception {
.header(HttpHeaders.AUTHORIZATION, userAuthorization)
.contentType(JSON).content(objectMapper.writeValueAsString(configuration));

when(nodeDAO.createConfiguration(Mockito.anyString(), Mockito.any(Configuration.class)))
.thenReturn(configuration);

mockMvc.perform(request).andExpect(status().isOk());

request = put("/config?parentNodeId=a")
Expand All @@ -107,6 +115,8 @@ public void testUpdateConfiguration() throws Exception {
configuration.setConfigurationNode(configurationNode);

when(nodeDAO.getNode("uniqueId")).thenReturn(configurationNode);
when(nodeDAO.updateConfiguration(Mockito.any(Configuration.class)))
.thenReturn(configuration);

MockHttpServletRequestBuilder request = post("/config")
.header(HttpHeaders.AUTHORIZATION, userAuthorization)
Expand Down
16 changes: 16 additions & 0 deletions .../java/org/phoebus/service/saveandrestore/web/controllers/ConfigurationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;

import java.util.Collections;
import java.util.List;

import static org.mockito.Mockito.reset;
Expand Down Expand Up @@ -104,6 +105,9 @@ public void testCreateConfiguration1() throws Exception {
configurationData.setPvList(List.of(ConfigPv.builder().pvName("foo").readbackPvName("bar").build()));

configuration.setConfigurationData(configurationData);

when(nodeDAO.createConfiguration(Mockito.anyString(), Mockito.any(Configuration.class)))
.thenReturn(configuration);
MockHttpServletRequestBuilder request = put("/config?parentNodeId=a")
.header(HttpHeaders.AUTHORIZATION, adminAuthorization)
.contentType(JSON).content(objectMapper.writeValueAsString(configuration));
Expand All @@ -118,6 +122,12 @@ public void testCreateConfiguration2() throws Exception {

Configuration configuration = new Configuration();
configuration.setConfigurationNode(Node.builder().build());
ConfigurationData configurationData = new ConfigurationData();
configurationData.setPvList(Collections.emptyList());
configuration.setConfigurationData(configurationData);

when(nodeDAO.createConfiguration(Mockito.anyString(), Mockito.any(Configuration.class)))
.thenReturn(configuration);

MockHttpServletRequestBuilder request = put("/config?parentNodeId=a")
.header(HttpHeaders.AUTHORIZATION, userAuthorization)
Expand Down Expand Up @@ -167,6 +177,8 @@ public void testUpdateConfiguration1() throws Exception {
configuration.setConfigurationNode(configurationNode);

when(nodeDAO.getNode("uniqueId")).thenReturn(configurationNode);
when(nodeDAO.updateConfiguration(Mockito.any(Configuration.class)))
.thenReturn(configuration);

MockHttpServletRequestBuilder request = post("/config")
.header(HttpHeaders.AUTHORIZATION, userAuthorization)
Expand All @@ -186,6 +198,8 @@ public void tesUpdateConfiguration2() throws Exception {
configuration.setConfigurationNode(configurationNode);

when(nodeDAO.getNode("uniqueId")).thenReturn(configurationNode);
when(nodeDAO.updateConfiguration(Mockito.any(Configuration.class)))
.thenReturn(configuration);

MockHttpServletRequestBuilder request = post("/config")
.header(HttpHeaders.AUTHORIZATION, userAuthorization)
Expand All @@ -204,6 +218,8 @@ public void testUpdateConfiguration3() throws Exception {
configuration.setConfigurationNode(configurationNode);

when(nodeDAO.getNode("uniqueId")).thenReturn(configurationNode);
when(nodeDAO.updateConfiguration(Mockito.any(Configuration.class)))
.thenReturn(configuration);

MockHttpServletRequestBuilder request = post("/config")
.header(HttpHeaders.AUTHORIZATION, adminAuthorization)
Expand Down
6 changes: 6 additions & 0 deletions .../test/java/org/phoebus/service/saveandrestore/web/controllers/SnapshotControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ public void testCreateSnapshot3() throws Exception{

String snapshotString = objectMapper.writeValueAsString(snapshot);

when(nodeDAO.createSnapshot(Mockito.anyString(), Mockito.any(Snapshot.class)))
.thenReturn(snapshot);

MockHttpServletRequestBuilder request = put("/snapshot?parentNodeId=a")
.header(HttpHeaders.AUTHORIZATION, adminAuthorization)
.contentType(JSON)
Expand Down Expand Up @@ -263,6 +266,9 @@ public void testUpdateSnapshot4() throws Exception{

String snapshotString = objectMapper.writeValueAsString(snapshot);

when(nodeDAO.updateSnapshot(Mockito.any(Snapshot.class)))
.thenReturn(snapshot);

MockHttpServletRequestBuilder request = post("/snapshot")
.header(HttpHeaders.AUTHORIZATION, adminAuthorization)
.contentType(JSON)
Expand Down