- GET /features is now tested on controller level
- added DataService as a data provider
This commit is contained in:
parent
191a5b836d
commit
923e000474
33
pom.xml
33
pom.xml
@ -20,6 +20,10 @@
|
|||||||
<maven.compiler.target>11</maven.compiler.target>
|
<maven.compiler.target>11</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
<lombok.version>1.18.12</lombok.version>
|
||||||
|
<mockito.version>3.3.0</mockito.version>
|
||||||
|
<junit.version>4.12</junit.version>
|
||||||
|
<hamcrest.version>2.1</hamcrest.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -39,6 +43,35 @@
|
|||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${lombok.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- test dependencies -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-core</artifactId>
|
||||||
|
<version>${mockito.version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>${junit.version}</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.hamcrest</groupId>
|
||||||
|
<artifactId>hamcrest</artifactId>
|
||||||
|
<version>2.1</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -1,16 +1,26 @@
|
|||||||
package click.poweronoff.satellite.api;
|
package click.poweronoff.satellite.api;
|
||||||
|
|
||||||
|
|
||||||
|
import click.poweronoff.satellite.domain.Feature;
|
||||||
|
import click.poweronoff.satellite.service.DataService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
public class FeaturesController {
|
public class FeaturesController {
|
||||||
@RequestMapping("/features")
|
|
||||||
|
@Autowired
|
||||||
|
DataService dataService;
|
||||||
|
|
||||||
|
@RequestMapping(value = "/features", method = RequestMethod.GET, produces = "application/json")
|
||||||
public @ResponseBody
|
public @ResponseBody
|
||||||
String features() {
|
List<Feature> features() {
|
||||||
return "a dummy message";
|
return dataService.getAllFeatures();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
21
src/main/java/click/poweronoff/satellite/domain/Feature.java
Normal file
21
src/main/java/click/poweronoff/satellite/domain/Feature.java
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
package click.poweronoff.satellite.domain;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@EqualsAndHashCode
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class Feature {
|
||||||
|
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
private long timestamp;
|
||||||
|
|
||||||
|
private long beginViewingDate;
|
||||||
|
|
||||||
|
private long endViewingDate;
|
||||||
|
|
||||||
|
private String missionName;
|
||||||
|
}
|
@ -0,0 +1,32 @@
|
|||||||
|
package click.poweronoff.satellite.service;
|
||||||
|
|
||||||
|
import click.poweronoff.satellite.domain.Feature;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface DataService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* returned all possible Features as a list
|
||||||
|
*
|
||||||
|
* @return list of Features
|
||||||
|
*/
|
||||||
|
List<Feature> getAllFeatures();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* returned specific Feature by given id
|
||||||
|
*
|
||||||
|
* @param featureId feature id
|
||||||
|
* @return Feature
|
||||||
|
*/
|
||||||
|
Feature getFeature(final String featureId);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* returned a picture as a Base64 encoded String representation for given feature id
|
||||||
|
*
|
||||||
|
* @param featureId feature id
|
||||||
|
* @return a Base64 encoded String representation for a picture
|
||||||
|
*/
|
||||||
|
String getPictureAsB64(final String featureId);
|
||||||
|
}
|
@ -0,0 +1,24 @@
|
|||||||
|
package click.poweronoff.satellite.service;
|
||||||
|
|
||||||
|
import click.poweronoff.satellite.domain.Feature;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class DataServiceImpl implements DataService {
|
||||||
|
|
||||||
|
public List<Feature> getAllFeatures() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Feature getFeature(String featureId) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPictureAsB64(String featureId) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
@ -1,15 +1,22 @@
|
|||||||
package click.poweronoff.satellite.api;
|
package click.poweronoff.satellite.api;
|
||||||
|
|
||||||
|
import click.poweronoff.satellite.domain.Feature;
|
||||||
|
import click.poweronoff.satellite.service.DataService;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||||
import org.springframework.test.web.servlet.MockMvc;
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import static org.hamcrest.Matchers.containsString;
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.hamcrest.Matchers.is;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@ -18,10 +25,22 @@ public class FeaturesControllerTest {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private MockMvc mockMvc;
|
private MockMvc mockMvc;
|
||||||
|
|
||||||
|
@MockBean
|
||||||
|
DataService dataService;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void shouldReturnDefaultMessage() throws Exception {
|
public void getFeaturesShouldReturnDefaultMessage() throws Exception {
|
||||||
this.mockMvc.perform(get("/features")).andDo(print()).andExpect(status().isOk())
|
when(dataService.getAllFeatures()).thenReturn(List.of(new Feature("feature-id", 123L, 234L, 345L, "mission")));
|
||||||
.andExpect(content().string(containsString("a dummy message")));
|
this.mockMvc.perform(get("/features")).andDo(print())
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(content().contentType("application/json"))
|
||||||
|
.andExpect(jsonPath("$[0].id").exists())
|
||||||
|
.andExpect(jsonPath("$[0].id", is("feature-id")))
|
||||||
|
.andExpect(jsonPath("$[0].timestamp", is(123)))
|
||||||
|
.andExpect(jsonPath("$[0].beginViewingDate", is(234)))
|
||||||
|
.andExpect(jsonPath("$[0].endViewingDate", is(345)))
|
||||||
|
.andExpect(jsonPath("$[0].missionName", is("mission"))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user