From d2fc14f9f7dc500000e376b59732b48b700bbb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sat, 7 Mar 2015 18:19:12 +0200 Subject: [PATCH] Compile individual files --- .../scala/com/querydsl/scala/CompileTestUtils.scala | 10 ++++++++-- .../com/querydsl/scala/sql/JDBCIntegrationTest.scala | 4 ++-- .../com/querydsl/scala/sql/MetaDataExporterTest.scala | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) 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 387c0880b..3f48c4ae8 100644 --- a/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala +++ b/querydsl-scala/src/test/scala/com/querydsl/scala/CompileTestUtils.scala @@ -24,9 +24,15 @@ trait CompileTestUtils { } def assertCompileSuccess(files: Traversable[File]): Unit = { + for (file <- files) { + assertCompileSuccess(fromFile(file).mkString) + } + } + + def assertCompileSuccessCombined(files: Traversable[File]): Unit = { assertCompileSuccess(files - map (fromFile(_).mkString) - mkString ("\n")) + map (fromFile(_).mkString) + mkString ("\n")) } def assertCompileSuccess(source: String): Unit = { 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 01cacbc5b..92bc42f70 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 @@ -100,8 +100,8 @@ class JDBCIntegrationTest extends CompileTestUtils with SQLHelpers { exporter.setTypeMappings(ScalaTypeMappings.create) exporter.setSchemaPattern("PUBLIC") exporter.export(connection.getMetaData) - - assertCompileSuccess(recursiveFileList(directory)) + + assertCompileSuccessCombined(recursiveFileList(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 49e5e2721..23866ee39 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 @@ -97,8 +97,8 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setCreateScalaSources(true) exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - - assertCompileSuccess(recursiveFileList(directory)) + + assertCompileSuccessCombined(recursiveFileList(directory)) } @Test @@ -136,8 +136,8 @@ class MetaDataExporterTest extends CompileTestUtils { exporter.setCreateScalaSources(true) exporter.setTypeMappings(ScalaTypeMappings.create) exporter.export(connection.getMetaData) - - assertCompileSuccess(recursiveFileList(directory)) + + assertCompileSuccessCombined(recursiveFileList(directory)) } } \ No newline at end of file