diff --git a/pom.xml b/pom.xml index ec278e4..c747ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -68,17 +68,6 @@ mysql-connector-java 8.0.24 - - junit - junit - test - - - junit - junit - 4.11 - test - junit junit @@ -98,8 +87,6 @@ test - - diff --git a/src/main/java/spg/finalchallenge/config/SwaggerConfig.java b/src/main/java/spg/finalchallenge/config/SwaggerConfig.java index 36b3292..254e5e1 100644 --- a/src/main/java/spg/finalchallenge/config/SwaggerConfig.java +++ b/src/main/java/spg/finalchallenge/config/SwaggerConfig.java @@ -34,8 +34,8 @@ private ApiInfo metaInfo(){ "API REST desenvolvida para o desafio final Luiza Code", "1.0", "Terms of service", - new Contact("Edith Soares / Pollyana Veloso / Marcela Lima / Maria Tereza / Larissa Palhao", - "","[edith.soaares, pollyvel20, limamarcela6795, therezaaltarugio, larissa.palhao]@gmail.com"), + new Contact("Edith Soares / Pollyana Veloso / Marcela Lima / Maria Tereza", + "","[edith.soaares, pollyvel20, limamarcela6795, therezaaltarugio"), "Apcahe License Version 2.0", "https://www.apache.org/license.html", new ArrayList() ); diff --git a/src/main/java/spg/finalchallenge/service/WishlistService.java b/src/main/java/spg/finalchallenge/service/WishlistService.java index 058c32c..6d59c21 100644 --- a/src/main/java/spg/finalchallenge/service/WishlistService.java +++ b/src/main/java/spg/finalchallenge/service/WishlistService.java @@ -41,7 +41,6 @@ public void quantity(Wishlist wishlist) { wishlist.setQuantity(total); } - // Subtrai o valor do produto removido public void subTotal(Wishlist wishlist) { BigDecimal total = BigDecimal.ZERO; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4f51e58..ce241d7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,3 +9,13 @@ ## The SQL dialect makes Hibernate generate better SQL for the chosen database #spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect +#spring.h2.console.enabled=true +#spring.h2.console.path=/h2 +#spring.datasource.url=jdbc:h2:mem:teste +#spring.datasource.driver-class-name=org.h2.Driver +#spring.datasource.username=sa +#spring.datasource.password=password +#spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +#server.port=8080 +#spring.jpa.hibernate.ddl-auto=create +#spring.jpa.show-sql=true \ No newline at end of file diff --git a/test/java/spg/finalchallenge/service/ClientServiceTest.java b/test/java/spg/finalchallenge/service/ClientServiceTest.java new file mode 100644 index 0000000..204b4fa --- /dev/null +++ b/test/java/spg/finalchallenge/service/ClientServiceTest.java @@ -0,0 +1,67 @@ +package spg.finalchallenge.service; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import spg.finalchallenge.entity.Client; + + + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ClientServiceTest { + + @Autowired + ClientService clientServiceTest; + + private Client instaceClient(String name, String cpf){ + Client client = new Client(); + client.setName(name); + client.setCpf(cpf); + return clientServiceTest.saveClient(client); + } + + + @Test + public void saveClient(){ + Client client = instaceClient("Edith", "123"); + + assertThat(client).isNotNull(); + } + + + @Test + public void checkIdClientSave(){ + Client client = instaceClient("Edith", "123"); + + //Client clientSave = clientServiceTest.saveClient(client); + + assertThat(client.getId()).isEqualTo(1); + } + + @Test + public void getClientById(){ + Client client = instaceClient("Edith", "123"); + + //Client clientSave = clientServiceTest.saveClient(client); + + Client found = clientServiceTest.getId(client.getId()); + + assertThat(found.getName()).isEqualTo(client.getName()); + } + + @Test + public void countClient(){ + Client client = instaceClient("Edith", "123");// + +// Client clientSvae = clientServiceTest.saveClient(client); + + long qtd = clientServiceTest.count(); + + assertThat(qtd).isEqualTo(1); + } +} diff --git a/test/java/spg/finalchallenge/service/ProductServiceTest.java b/test/java/spg/finalchallenge/service/ProductServiceTest.java new file mode 100644 index 0000000..1c8d95d --- /dev/null +++ b/test/java/spg/finalchallenge/service/ProductServiceTest.java @@ -0,0 +1,71 @@ +package spg.finalchallenge.service; + + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import spg.finalchallenge.entity.Client; +import spg.finalchallenge.entity.Product; + +import java.math.BigDecimal; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ProductServiceTest { + + @Autowired + ProductService productServiceTest; + + private Product instanceProduct(String name, BigDecimal value, String descripion){ + Product product = new Product(); + product.setName(name); + product.setValue(value); + product.setDescription(descripion); + return productServiceTest.saveProduct(product); + } + + + + @Test + public void saveClient(){ + Product product = instanceProduct("Notbook", BigDecimal.valueOf(3400), "Product save in Banck"); + + assertThat(product).isNotNull(); + } + + + @Test + public void checkIdClientSave(){ + Product product = instanceProduct("Notbook", BigDecimal.valueOf(3400), "Product save in Banck"); + + //Client clientSave = clientServiceTest.saveClient(client); + + assertThat(product.getId()).isEqualTo(1); + } + + @Test + public void getClientById(){ + Product product = instanceProduct("Notbook", BigDecimal.valueOf(3400), "Product save in Banck"); + + //Client clientSave = clientServiceTest.saveClient(client); + + Product found = productServiceTest.getId(product.getId()); + + assertThat(found.getName()).isEqualTo(product.getName()); + } + + @Test + public void countClient(){ + Product product = instanceProduct("Notbook", BigDecimal.valueOf(3400), "Product save in Banck");// + +// Client clientSvae = clientServiceTest.saveClient(client); + + long qtd = productServiceTest.count(); + + assertThat(qtd).isEqualTo(1); + } +} diff --git a/test/java/spg/finalchallenge/service/WishlistServiceTest.java b/test/java/spg/finalchallenge/service/WishlistServiceTest.java new file mode 100644 index 0000000..a9f9c76 --- /dev/null +++ b/test/java/spg/finalchallenge/service/WishlistServiceTest.java @@ -0,0 +1,56 @@ +package spg.finalchallenge.service; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import spg.finalchallenge.entity.Client; +import spg.finalchallenge.entity.Product; +import spg.finalchallenge.entity.Wishlist; + +import javax.xml.crypto.Data; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class WishlistServiceTest { + + @Autowired + WishlistService wishlistServiceTest; + + private List createProduct(String name, BigDecimal value, String descripion){ + Product product = new Product(); + product.setName(name); + product.setValue(value); + product.setDescription(descripion); + + List proList = new ArrayList<>(); + proList.add(product); + + return proList; + } + + private Client creatClient(String name, String cpf){ + Client client = new Client(); + client.setName(name); + client.setCpf(cpf); + return client; + } + + private Wishlist instaceWishlist(Client client, List products){ + Wishlist wishlist = new Wishlist(); + wishlist.setClient(client); + wishlist.setProducts(products); + return wishlist; + } + + @Test + public void teste(){ + System.out.println("certooo!!!"); + } +} diff --git a/test/resources/application.properties b/test/resources/application.properties new file mode 100644 index 0000000..2c1d3c6 --- /dev/null +++ b/test/resources/application.properties @@ -0,0 +1,11 @@ + +spring.h2.console.enabled=true +spring.h2.console.path=/h2 +spring.datasource.url=jdbc:h2:mem:teste +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +server.port=8080 +spring.jpa.hibernate.ddl-auto=create +spring.jpa.show-sql=true \ No newline at end of file