Move relativizing of files to Path

Author: Shredder121

querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/HibernateDomainExporterTest.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Set;
 
 import org.hibernate.cfg.Configuration;
@@ -45,16 +46,17 @@ public void test() throws IOException {
         for (Class<?> cl : Domain.classes) {
             cfg.addAnnotatedClass(cl);
         }
-        HibernateDomainExporter exporter = new HibernateDomainExporter(folder.getRoot(), cfg);
+        Path outputFolder = folder.getRoot().toPath();
+        HibernateDomainExporter exporter = new HibernateDomainExporter(outputFolder.toFile(), cfg);
         exporter.execute();
 
         File origRoot = new File("../querydsl-jpa/target/generated-test-sources/java");
         Set<File> files = exporter.getGeneratedFiles();
         assertFalse(files.isEmpty());
         for (File file : files) {
-            String path = file.getAbsolutePath().replace(
-                    folder.getRoot().getAbsolutePath(), origRoot.getAbsolutePath());
-            String reference = Files.toString(new File(path), Charsets.UTF_8);
+            Path relativeFile = outputFolder.relativize(file.toPath());
+            Path origFile = origRoot.toPath().resolve(relativeFile);
+            String reference = Files.toString(origFile.toFile(), Charsets.UTF_8);
             String content = Files.toString(file, Charsets.UTF_8);
             errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
         }

querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/JPADomainExporterTest.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Properties;
 import java.util.Set;
 
@@ -44,16 +45,17 @@ public class JPADomainExporterTest {
     @Test
     public void test() throws IOException {
         EntityManagerFactory emf = Persistence.createEntityManagerFactory("h2", new Properties());
-        JPADomainExporter exporter = new JPADomainExporter(folder.getRoot(), emf.getMetamodel());
+        Path outputFolder = folder.getRoot().toPath();
+        JPADomainExporter exporter = new JPADomainExporter(outputFolder.toFile(), emf.getMetamodel());
         exporter.execute();
 
         File origRoot = new File("../querydsl-jpa/target/generated-test-sources/java");
         Set<File> files = exporter.getGeneratedFiles();
         assertFalse(files.isEmpty());
         for (File file : files) {
-            String path = file.getAbsolutePath().replace(
-                    folder.getRoot().getAbsolutePath(), origRoot.getAbsolutePath());
-            String reference = Files.toString(new File(path), Charsets.UTF_8);
+            Path relativeFile = outputFolder.relativize(file.toPath());
+            Path origFile = origRoot.toPath().resolve(relativeFile);
+            String reference = Files.toString(origFile.toFile(), Charsets.UTF_8);
             String content = Files.toString(file, Charsets.UTF_8);
             errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
         }

querydsl-jpa-codegen/src/test/java/com/querydsl/jpa/codegen/ant/AntJPADomainExporterTest.java

@@ -6,6 +6,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Set;
 
 import org.junit.Rule;
@@ -29,17 +30,18 @@ public void test() throws IOException {
         AntJPADomainExporter exporter = new AntJPADomainExporter();
         exporter.setNamePrefix("Q");
         exporter.setNameSuffix("");
-        exporter.setTargetFolder(folder.getRoot().getAbsolutePath());
+        Path outputFolder = folder.getRoot().toPath();
+        exporter.setTargetFolder(outputFolder.toFile().getAbsolutePath());
         exporter.setPersistenceUnitName("h2");
         exporter.execute();
 
         File origRoot = new File("../querydsl-jpa/target/generated-test-sources/java");
         Set<File> files = exporter.getGeneratedFiles();
         assertFalse(files.isEmpty());
         for (File file : files) {
-            String path = file.getAbsolutePath().replace(
-                    folder.getRoot().getAbsolutePath(), origRoot.getAbsolutePath());
-            String reference = Files.toString(new File(path), Charsets.UTF_8);
+            Path relativeFile = outputFolder.relativize(file.toPath());
+            Path origFile = origRoot.toPath().resolve(relativeFile);
+            String reference = Files.toString(origFile.toFile(), Charsets.UTF_8);
             String content = Files.toString(file, Charsets.UTF_8);
             errors.checkThat("Mismatch for " + file.getPath(), content, is(equalTo(reference)));
         }