Merge pull request #55 from NetoDevel/feature/#48-fix-duplication-metada

netodevel · web-flow · commit 62f2499c4508 · 2019-07-02T19:57:35.000-03:00
#54 Fixs tests
diff --git a/spring-boot-generate/spring-boot-generate.iml b/spring-boot-generate/spring-boot-generate.iml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.4.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.40" level="project" />
+    <orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.11.0" level="project" />
+  </component>
+</module>
diff --git a/spring-boot-generate/src/main/java/br/com/generate/ReadTemplateFile.java b/spring-boot-generate/src/main/java/br/com/generate/ReadTemplateFile.java
@@ -7,7 +7,7 @@
  */
 public abstract class ReadTemplateFile extends AbstractGenerate {
 
-	protected abstract String operationGenerate(String javaStrings, String nameClass, String parameters);
+	public abstract String operationGenerate(String javaStrings, String nameClass, String parameters);
 
 	private GenerateValidator validatorGenerate = new GenerateValidator();
 	
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/controller/ControllerCleanGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/controller/ControllerCleanGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".controller")
 				.replace("${path}", nameClass.toLowerCase())
 				.replace("${className}", nameClass);
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/controller/ControllerGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/controller/ControllerGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".controller")
 				.replace("${package_model}", getPackage() + ".model")
 				.replace("${package_service}", getPackage() + ".service")
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/model/ModelGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/model/ModelGenerator.java
@@ -18,7 +18,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".model")
 				.replace("${imports}", ModelGenerateUtils.generateImports(parameters))
 				.replace("${className}", nameClass)
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/repository/RepositoryCleanGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/repository/RepositoryCleanGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".repository")
 				.replace("${className}", nameClass);
 	}
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/repository/RepositoryGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/repository/RepositoryGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".repository")
 				.replace("${package_model}", getPackage() + ".model")
 				.replace("${className}", nameClass);
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/service/ServiceCleanGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/service/ServiceCleanGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		return javaStrings.replace("${package}", getPackage() + ".service")
 				.replace("${className}", nameClass);
 	}
diff --git a/spring-boot-generate/src/main/java/br/com/generate/java/command/service/ServiceGenerator.java b/spring-boot-generate/src/main/java/br/com/generate/java/command/service/ServiceGenerator.java
@@ -13,7 +13,7 @@ public String getLayer() {
 	}
 
 	@Override
-	protected String operationGenerate(String javaStrings, String nameClass, String parameters) {
+	public String operationGenerate(String javaStrings, String nameClass, String parameters) {
 		if ( getSpringVersion().equals("2.x") ) {
 			javaStrings = javaStrings.replace(".findOne(id)", ".findById(id).get()");
 		}
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ControllerGenerateTest.java
@@ -1,49 +1,25 @@
 package br.com.netodevel.generate.test;
 
-import static org.junit.Assert.assertEquals;
+import br.com.generate.Layers;
+import br.com.generate.java.command.controller.ControllerGenerator;
+import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import br.com.generate.Layers;
-import br.com.generate.java.command.controller.ControllerGenerator;
-import br.com.netodevel.generate.utils.FileGeneratorTestUtils;
+import static org.junit.Assert.assertEquals;
 
 public class ControllerGenerateTest {
 
-	File controllerGeneratorFile;
-	File convertControllerToText;
-
-	@Before
-	public void setUp() throws IOException {
-		new ControllerGenerator().generate("User", null, "template-controller.txt");
-		controllerGeneratorFile = new File("src/main/java/br/com/example/controller/UserController.java");
-		convertControllerToText = FileGeneratorTestUtils.convertJavaToText(controllerGeneratorFile, Layers.CONTROLLER, "UserControllerTest.txt");
-	}
-
-	@Test
-	public void testGenerateService() throws IOException {
-		boolean validateFileEquals = FileUtils.contentEquals(convertControllerToText, new File("src/test/resources/templates/java/controller/UserController.txt"));
-		assertEquals("should be true", true, validateFileEquals);
-	}
-
-	@Test
-	public void testValidateFileExists() throws IOException {
-		java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
-		System.setOut(new java.io.PrintStream(out));
-		new ControllerGenerator().generate("User", null, "template-controller.txt");
-		String outPutExpected = "Error: file UserController.java already exists.";
-		assertEquals("should be true", outPutExpected.trim(), out.toString().trim());
-	}
-
-	@After
-	public void tearDown() throws IOException {
-		FileGeneratorTestUtils.deleteFileAndDirectory(controllerGeneratorFile, convertControllerToText);
-	}
+    @Test
+    public void shouldGenerateController() throws IOException {
+        ControllerGenerator controllerGenerator = new ControllerGenerator();
+        String javaStrings = controllerGenerator.readTemplateFile("template-controller.txt");
+
+        String expectedValue = new LoadTemplateHelper().loadDataset(Layers.CONTROLLER, "UserController.txt");
+        String generatedValue = controllerGenerator.operationGenerate(javaStrings, "User", "name:String");
+
+        assertEquals(expectedValue, generatedValue);
+    }
 
 }
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorTest.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryCleanGeneratorTest.java
@@ -1,48 +1,25 @@
 package br.com.netodevel.generate.test;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import br.com.generate.Layers;
 import br.com.generate.java.command.repository.RepositoryCleanGenerator;
-import br.com.netodevel.generate.utils.FileGeneratorTestUtils;
+import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import org.junit.Test;
 
-public class RepositoryCleanGeneratorTest {
+import java.io.IOException;
 
-	File repositoryCleanGeneratorFile;
-	File convertRepositoryCleanToText;
+import static org.junit.Assert.assertEquals;
 
-	@Before
-	public void setUp() throws IOException {
-		new RepositoryCleanGenerator().generate("User", null, "template-clean-repository.txt");
-		repositoryCleanGeneratorFile = new File("src/main/java/br/com/example/repository/UserRepository.java");
-		convertRepositoryCleanToText = FileGeneratorTestUtils.convertJavaToText(repositoryCleanGeneratorFile, Layers.REPOSITORY, "UserCleanRepositoryTest.txt");
-	}
+public class RepositoryCleanGeneratorTest {
 
 	@Test
-	public void testGenerateRespositoryClean() throws IOException {
-		boolean validateFileEquals = FileUtils.contentEquals(convertRepositoryCleanToText, new File("src/test/resources/templates/java/repository/UserCleanRepository.txt"));
-		assertEquals("should be true", true, validateFileEquals);
-	}
+	public void shouldGenerateRepository() throws IOException {
+		RepositoryCleanGenerator repositoryGenerator = new RepositoryCleanGenerator();
+		String javaStrings = repositoryGenerator.readTemplateFile("template-clean-repository.txt");
 
-	@Test
-	public void testValidateFileExists() throws IOException {
-		java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
-		System.setOut(new java.io.PrintStream(out));
-		new RepositoryCleanGenerator().generate("User", null, "template-clean-repository.txt");
-		String outPutExpected = "Error: file UserRepository.java already exists.";
-		assertEquals("should be true", outPutExpected.trim(), out.toString().trim());
-	}
+		String expectedValue = new LoadTemplateHelper().loadDataset(Layers.REPOSITORY,"UserCleanRepository.txt");
+		String generatedValue = repositoryGenerator.operationGenerate(javaStrings, "User", "name:String");
 
-	@After
-	public void tearDown() throws IOException {
-		FileGeneratorTestUtils.deleteFileAndDirectory(repositoryCleanGeneratorFile, convertRepositoryCleanToText);
+		assertEquals(expectedValue, generatedValue);
 	}
+
 }
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/RepositoryGenerateTest.java
@@ -1,51 +1,25 @@
 package br.com.netodevel.generate.test;
 
-import static org.junit.Assert.assertEquals;
+import br.com.generate.Layers;
+import br.com.generate.java.command.repository.RepositoryGenerator;
+import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import br.com.generate.Layers;
-import br.com.generate.java.command.repository.RepositoryGenerator;
-import br.com.netodevel.generate.utils.FileGeneratorTestUtils;
+import static org.junit.Assert.assertEquals;
 
 public class RepositoryGenerateTest {
 
-	File repositoryGeneratorFile;
-	File convertRepositoryToText;
-
-	@Before
-	public void setUp() throws IOException {
-		new RepositoryGenerator().generate("User", null, "template-repository.txt");
-		repositoryGeneratorFile = new File("src/main/java/br/com/example/repository/UserRepository.java");
-		convertRepositoryToText = FileGeneratorTestUtils.convertJavaToText(repositoryGeneratorFile, Layers.REPOSITORY, "UserRepositoryTest.txt");
-	}
-
-	@Test
-	public void testGenerateRepository() throws IOException {
-		boolean validateFileEquals = FileUtils.contentEquals(convertRepositoryToText, new File("src/test/resources/templates/java/repository/UserRepository.txt"));
-		assertEquals("should be true", true, validateFileEquals);
-	}
-
-	@Test
-	public void testValidateFileExists() throws IOException {
-		java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
-		System.setOut(new java.io.PrintStream(out));
-		new RepositoryGenerator().generate("User", null, "template-repository.txt");
-		String outPutExpected = "Error: file UserRepository.java already exists.";
-		assertEquals("should be true", outPutExpected.trim(), out.toString().trim());
-
-	}
-
-	@After
-	public void tearDown() throws IOException {
-		FileGeneratorTestUtils.deleteFileAndDirectory(repositoryGeneratorFile, convertRepositoryToText);
-	}
+    @Test
+    public void repositoryGeneratorTest() throws IOException {
+        RepositoryGenerator repositoryGenerator = new RepositoryGenerator();
+        String javaStrings = repositoryGenerator.readTemplateFile("template-repository.txt");
+
+        String expectedValue = new LoadTemplateHelper().loadDataset(Layers.REPOSITORY, "UserRepository.txt");
+        String generatedValue = repositoryGenerator.operationGenerate(javaStrings, "User", "name:String");
 
+        assertEquals(expectedValue, generatedValue);
+    }
 
 }
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/test/ServiceGenerateTest.java
@@ -1,49 +1,26 @@
 package br.com.netodevel.generate.test;
 
-import static org.junit.Assert.assertEquals;
+import br.com.generate.Layers;
+import br.com.generate.java.command.service.ServiceGenerator;
+import br.com.netodevel.generate.utils.LoadTemplateHelper;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import br.com.generate.Layers;
-import br.com.generate.java.command.service.ServiceGenerator;
-import br.com.netodevel.generate.utils.FileGeneratorTestUtils;
+import static org.junit.Assert.assertEquals;
 
 public class ServiceGenerateTest {
 
-	File serviceGeneratorFile;
-	File convertServiceToText;
-
-	@Before
-	public void setUp() throws IOException {
-		new ServiceGenerator().generate("User", null, "template-service.txt");
-		serviceGeneratorFile = new File("src/main/java/br/com/example/service/UserService.java");
-		convertServiceToText = FileGeneratorTestUtils.convertJavaToText(serviceGeneratorFile, Layers.SERVICE, "UserServiceTest.txt");
-	}
-
-	@Test
-	public void testGenerateService() throws IOException {
-		boolean validateFileEquals = FileUtils.contentEquals(convertServiceToText, new File("src/test/resources/templates/java/service/UserService.txt"));
-		assertEquals("should be true", true, validateFileEquals);
-	}
-
-	@Test
-	public void testValidateFileExists() throws IOException {
-		java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
-		System.setOut(new java.io.PrintStream(out));
-		new ServiceGenerator().generate("User", null, "template-service.txt");
-		String outPutExpected = "Error: file UserService.java already exists.";
-		assertEquals("should be true", outPutExpected.trim(), out.toString().trim());
-	}
-
-	@After
-	public void tearDown() throws IOException {
-		FileGeneratorTestUtils.deleteFileAndDirectory(serviceGeneratorFile, convertServiceToText);
-	}
+    @Test
+    public void shouldGeneratorService() throws IOException {
+        ServiceGenerator serviceGenerator = new ServiceGenerator();
+        String javaStrings = serviceGenerator.readTemplateFile("template-service.txt");
+
+        String expectedValue = new LoadTemplateHelper().loadDataset(Layers.SERVICE, "UserService.txt");
+        String generatedValue = serviceGenerator.operationGenerate(javaStrings, "User", "name:String");
+
+        assertEquals(expectedValue, generatedValue);
+    }
 
 }
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/FileGeneratorTestUtils.java
@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.commons.io.FileDeleteStrategy;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -21,9 +22,9 @@ public static File convertJavaToText(File file, String layer, String outPutFileN
 	
 	public static void deleteFileAndDirectory(File... files) throws IOException {
 		for (File file : files) {
-			file.delete();
+			FileDeleteStrategy.FORCE.delete(file);
 		}
-		FileUtils.deleteDirectory(new File("src/main/java/br/com/example"));
+//		FileUtils.forceDelete(new File("src/main/java/br/com/example"));
 	}
 	
 }
diff --git a/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java b/spring-boot-generate/src/test/java/br/com/netodevel/generate/utils/LoadTemplateHelper.java
diff --git a/spring-boot-generate/src/test/resources/templates/java/controller/UserControllerTest.txt b/spring-boot-generate/src/test/resources/templates/java/controller/UserControllerTest.txt

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public String getLayer() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- protected String operationGenerate(String javaStrings, String nameClass, String parameters) {`
	`16`	`+ public String operationGenerate(String javaStrings, String nameClass, String parameters) {`
`17`	`17`	`return javaStrings.replace("${package}", getPackage() + ".controller")`
`18`	`18`	`.replace("${path}", nameClass.toLowerCase())`
`19`	`19`	`.replace("${className}", nameClass);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public String getLayer() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- protected String operationGenerate(String javaStrings, String nameClass, String parameters) {`
	`21`	`+ public String operationGenerate(String javaStrings, String nameClass, String parameters) {`
`22`	`22`	`return javaStrings.replace("${package}", getPackage() + ".model")`
`23`	`23`	`.replace("${imports}", ModelGenerateUtils.generateImports(parameters))`
`24`	`24`	`.replace("${className}", nameClass)`