diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala index 61afa7662..472480ee6 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala @@ -11,7 +11,7 @@ import org.junit.Assert._ import scala.collection.JavaConversions._ -class CaseClassSerializerTest extends CompileTestUtils { +class CaseClassSerializerTest { val typeMappings = ScalaTypeMappings.create @@ -36,7 +36,7 @@ class CaseClassSerializerTest extends CompileTestUtils { serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) val str = writer.toString() - assertCompileSuccess(str) + CompileTestUtils.assertCompileSuccess(str) } } diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala index 3f48c4ae8..c77e3dbcd 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala @@ -8,7 +8,7 @@ import scala.io.Source.fromFile import java.io.File import java.io.File.pathSeparator -trait CompileTestUtils { +object CompileTestUtils { private object env extends Settings { @@ -23,12 +23,20 @@ trait CompileTestUtils { usejavacp.value = true } + def assertCompileSuccess(file: File): Unit = { + assertCompileSuccess(recursiveFileList(file)) + } + def assertCompileSuccess(files: Traversable[File]): Unit = { for (file <- files) { assertCompileSuccess(fromFile(file).mkString) } } + def assertCompileSuccessCombined(file: File): Unit = { + assertCompileSuccessCombined(recursiveFileList(file)) + } + def assertCompileSuccessCombined(files: Traversable[File]): Unit = { assertCompileSuccess(files map (fromFile(_).mkString) @@ -51,7 +59,7 @@ trait CompileTestUtils { } } - def recursiveFileList(file: File): Array[File] = { + private def recursiveFileList(file: File): Array[File] = { if (file.isDirectory) { file.listFiles.flatMap(recursiveFileList) } else { diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala index 535a82245..2391de14a 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterJPATest.scala @@ -5,7 +5,7 @@ import com.querydsl.codegen.GenericExporter import org.junit.Test import io.Source.fromFile -class GenericExporterJPATest extends CompileTestUtils { +class GenericExporterJPATest { @Test def Export { @@ -26,7 +26,7 @@ class GenericExporterJPATest extends CompileTestUtils { filter (_.getName.endsWith(".scala")) map (fromFile(_).mkString) mkString ("\n")) - assertCompileSuccess(sources) + CompileTestUtils.assertCompileSuccess(sources) } } diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala index 42dc5e6a2..f93acfa29 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/GenericExporterTest.scala @@ -6,7 +6,7 @@ import org.junit.Test import io.Source.fromFile import java.io.File -class GenericExporterTest extends CompileTestUtils { +class GenericExporterTest { @Test def Export { @@ -18,20 +18,20 @@ class GenericExporterTest extends CompileTestUtils { exporter.export(getClass.getPackage) val targetFolder = new File("target/gen1/com/querydsl/scala/") - + // com.querydsl.scala val sources = (targetFolder.listFiles() filter (_.getName.endsWith(".scala")) map (fromFile(_).mkString) mkString ("\n")) - assertCompileSuccess(sources) + CompileTestUtils.assertCompileSuccess(sources) // com.querydsl.scala.ext val other = (new File(targetFolder, "ext").listFiles() filter (_.getName.endsWith(".scala")) map (fromFile(_).mkString) mkString ("\n")) - assertCompileSuccess("import com.querydsl.scala.ext._\n" + other) + CompileTestUtils.assertCompileSuccess("import com.querydsl.scala.ext._\n" + other) } } diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala index 840c23b0b..c55563692 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaBeanSerializerTest.scala @@ -11,7 +11,7 @@ import org.junit.Assert._ import scala.collection.JavaConversions._ -class ScalaBeanSerializerTest extends CompileTestUtils { +class ScalaBeanSerializerTest { val typeMappings = ScalaTypeMappings.create @@ -63,6 +63,6 @@ class ScalaBeanSerializerTest extends CompileTestUtils { typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType)) serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) val str = writer.toString - assertCompileSuccess(str) + CompileTestUtils.assertCompileSuccess(str) } } \ No newline at end of file diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala index 4def5d2d0..c2073fe79 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala @@ -13,7 +13,7 @@ import com.querydsl.sql._ import java.io.StringWriter -class ScalaEntitySerializerTest extends CompileTestUtils { +class ScalaEntitySerializerTest { var entityType: EntityType = null @@ -69,6 +69,6 @@ class ScalaEntitySerializerTest extends CompileTestUtils { serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)) val str = writer.toString() //System.err.println(str); - assertCompileSuccess(str) + CompileTestUtils.assertCompileSuccess(str) } } \ No newline at end of file diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala index 92bc42f70..8fe1e2296 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/JDBCIntegrationTest.scala @@ -24,7 +24,7 @@ import com.querydsl.sql.codegen._ import com.querydsl.sql.dml._ import com.querydsl.scala.Helpers._ -class JDBCIntegrationTest extends CompileTestUtils with SQLHelpers { +class JDBCIntegrationTest extends SQLHelpers { val survey = QSurvey val employee = QEmployee @@ -82,7 +82,7 @@ class JDBCIntegrationTest extends CompileTestUtils with SQLHelpers { exporter.setSchemaPattern("PUBLIC") exporter.export(connection.getMetaData) - assertCompileSuccess(recursiveFileList(directory)) + CompileTestUtils.assertCompileSuccess(directory) } @Test @@ -101,7 +101,7 @@ class JDBCIntegrationTest extends CompileTestUtils with SQLHelpers { exporter.setSchemaPattern("PUBLIC") exporter.export(connection.getMetaData) - assertCompileSuccessCombined(recursiveFileList(directory)) + CompileTestUtils.assertCompileSuccessCombined(directory) } @Test diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala index 23866ee39..5ea3f46a5 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataExporterTest.scala @@ -16,7 +16,7 @@ import scala.collection.JavaConversions._ import com.querydsl.scala._ -class MetaDataExporterTest extends CompileTestUtils { +class MetaDataExporterTest { var connection: java.sql.Connection = _ @@ -48,7 +48,6 @@ class MetaDataExporterTest extends CompileTestUtils { CONSTRAINT PK_employee PRIMARY KEY (id), CONSTRAINT FK_superior FOREIGN KEY (superior_id) REFERENCES employee(id))""") - // table with count column stmt.execute("create table count_table(count int)") @@ -78,8 +77,8 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setCreateScalaSources(true) exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - - assertCompileSuccess(recursiveFileList(directory)) + + CompileTestUtils.assertCompileSuccess(directory) } @Test @@ -98,7 +97,7 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - assertCompileSuccessCombined(recursiveFileList(directory)) + CompileTestUtils.assertCompileSuccessCombined(directory) } @Test @@ -117,7 +116,7 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - assertCompileSuccess(recursiveFileList(directory)) + CompileTestUtils.assertCompileSuccess(directory) } @Test @@ -137,7 +136,7 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - assertCompileSuccessCombined(recursiveFileList(directory)) + CompileTestUtils.assertCompileSuccessCombined(directory) } } \ No newline at end of file diff --git a/querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataSerializerTest.scala b/querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala similarity index 100% rename from querydsl-scala/src/test/scala/com/querydsl/scala/sql/MetaDataSerializerTest.scala rename to querydsl-scala/src/test/scala/com/querydsl/scala/sql/ScalaMetaDataSerializerTest.scala