Refatorando para simplificação de código: - Removido CRUD de usuario e sistema. - Alterando versão do JUnit para usar o JUnit 5 para testes mais significativos. - Criado teste de lançamento de gastos

Author: jonatassantoszup

testeSantanderWay/pom.xml

@@ -19,7 +19,8 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<junit-jupiter.version>5.3.2</junit-jupiter.version>
+		<mockito.version>2.24.0</mockito.version>
 	</properties>
 
 	<dependencies>
@@ -109,7 +110,28 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>
@@ -130,6 +152,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.0</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>

testeSantanderWay/src/main/java/br/com/testesantanderway/config/security/AutenticacaoService.java

@@ -1,7 +1,7 @@
 package br.com.testesantanderway.config.security;
 
 import br.com.testesantanderway.modelo.Sistema;
-import br.com.testesantanderway.repository.ClienteRepository;
+import br.com.testesantanderway.repository.SistemaRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -14,7 +14,7 @@
 public class AutenticacaoService implements UserDetailsService {
 
     @Autowired
-    private ClienteRepository repository;
+    private SistemaRepository repository;
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {

testeSantanderWay/src/main/java/br/com/testesantanderway/config/security/AutenticacaoViaTokenFilter.java

@@ -1,7 +1,7 @@
 package br.com.testesantanderway.config.security;
 
 import br.com.testesantanderway.modelo.Sistema;
-import br.com.testesantanderway.repository.ClienteRepository;
+import br.com.testesantanderway.repository.SistemaRepository;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
@@ -16,9 +16,9 @@ public class AutenticacaoViaTokenFilter extends OncePerRequestFilter {
     private static final String BEARER = "Bearer ";
 
     private ServicoDeToken tokenService;
-    private ClienteRepository repository;
+    private SistemaRepository repository;
 
-    public AutenticacaoViaTokenFilter(ServicoDeToken tokenService, ClienteRepository repository) {
+    public AutenticacaoViaTokenFilter(ServicoDeToken tokenService, SistemaRepository repository) {
         this.tokenService = tokenService;
         this.repository = repository;
     }

testeSantanderWay/src/main/java/br/com/testesantanderway/config/security/ConfigSeguranca.java

@@ -1,6 +1,6 @@
 package br.com.testesantanderway.config.security;
 
-import br.com.testesantanderway.repository.ClienteRepository;
+import br.com.testesantanderway.repository.SistemaRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -23,7 +23,7 @@ public class ConfigSeguranca extends WebSecurityConfigurerAdapter {
     @Autowired
     private ServicoDeToken tokenService;
     @Autowired
-    private ClienteRepository clienteRepository;
+    private SistemaRepository sistemaRepository;
 
     @Override
     @Bean
@@ -54,7 +54,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .anyRequest().authenticated()
                 .and().csrf().disable()
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                .and().addFilterBefore(new AutenticacaoViaTokenFilter(tokenService, clienteRepository), UsernamePasswordAuthenticationFilter.class);
+                .and().addFilterBefore(new AutenticacaoViaTokenFilter(tokenService, sistemaRepository), UsernamePasswordAuthenticationFilter.class);
     }
 
     //Recursos estáticos(js, css, img, etc.)

testeSantanderWay/src/main/java/br/com/testesantanderway/controller/ClienteController.java

@@ -7,6 +7,7 @@
 import br.com.testesantanderway.dto.GastosDTO;
 import br.com.testesantanderway.modelo.Gasto;
 import br.com.testesantanderway.repository.GastoRepository;
+import br.com.testesantanderway.service.GastoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
@@ -21,13 +22,16 @@
 
 @RestController
 @RequestMapping("/gastos")
-public class GastosController {
+public class GastoController {
     @Autowired
     private ServicoDeToken servicoDeToken;
 
     @Autowired
     private GastoRepository gastoRepository;
 
+    @Autowired
+    private GastoService gastoService;
+
     @GetMapping
     @Cacheable(value = "gastoDeCliente")
     public Page<GastosDTO> listagemDeGastos(@RequestParam(required = false) String descricao,
@@ -49,8 +53,7 @@ public Page<GastosDTO> listagemDeGastos(@RequestParam(required = false) String d
     @PutMapping
     public ResponseEntity lancarGastosCartao(HttpServletRequest request, @RequestBody GastoForm form) {
         Gasto gasto = form.converter(servicoDeToken.getCodigo(AutenticacaoViaTokenFilter.recuperarToken(request)));
-        integrarCategoria(gasto);
-        gastoRepository.save(gasto);
+        gastoService.lancarGastosCartao(gasto);
         return ResponseEntity.ok().build();
     }
 
@@ -74,12 +77,4 @@ public ResponseEntity<DetalheGastosDTO> listagemDeGastosPorData(@PathVariable St
 //        return ResponseEntity.created(uri).body(new GastosDTO(categoriaCadastro));
 //    }
 
-    private void integrarCategoria(Gasto gasto){
-        if(gasto.getCategoria() == null){
-            Optional<String> categoria = gastoRepository.findCategoriaByDescricao(gasto.getDescricao());
-            if(categoria.isPresent()){
-                gasto.setCategoria(categoria.get());
-            }
-        }
-    }
 }

…nderway/controller/GastosController.java …anderway/controller/GastoController.javatesteSantanderWay/src/main/java/br/com/testesantanderway/controller/GastosController.java renamed to testeSantanderWay/src/main/java/br/com/testesantanderway/controller/GastoController.java testeSantanderWay/src/main/java/br/com/testesantanderway/controller/GastosController.java renamed to testeSantanderWay/src/main/java/br/com/testesantanderway/controller/GastoController.java

@@ -1,7 +1,7 @@
 package br.com.testesantanderway.controller.form;
 
 import br.com.testesantanderway.modelo.Sistema;
-import br.com.testesantanderway.repository.ClienteRepository;
+import br.com.testesantanderway.repository.SistemaRepository;
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -36,13 +36,13 @@ public void setSenha(String senha) {
         this.senha = senha;
     }
 
-    public Sistema atualizar(String id, ClienteRepository clienteRepository) {
-        Sistema sistema = clienteRepository.findById(id).orElseThrow(() -> new RuntimeException("Não encontrado"));
+    public Sistema atualizar(String id, SistemaRepository sistemaRepository) {
+        Sistema sistema = sistemaRepository.findById(id).orElseThrow(() -> new RuntimeException("Não encontrado"));
 
         sistema.setEmail(this.email);
         sistema.setSenha(this.senha);
 
-        clienteRepository.save(sistema);
+        sistemaRepository.save(sistema);
 
         return sistema;
     }