diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala index 550f5b82b..b9a6fe0ab 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala @@ -71,24 +71,17 @@ class JDBCIntegrationTest extends CompileTestUtils { val namingStrategy = new DefaultNamingStrategy() val exporter = new MetaDataExporter() exporter.setNamePrefix("Q") - exporter.setPackageName("test") + exporter.setPackageName("com.mysema") val directory = new File("target/gen1") exporter.setTargetFolder(directory) exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]) exporter.setCreateScalaSources(true) exporter.setTypeMappings(ScalaTypeMappings.create) + exporter.setSchemaPattern("PUBLIC") exporter.export(connection.getMetaData) assertCompileSuccess(recursiveFileList(directory)) } - - private def recursiveFileList(file: File): Array[File] = { - if (file.isDirectory) { - file.listFiles.flatMap(recursiveFileList(_)) - } else { - Array(file) - } - } @Test def Generation_with_Beantypes { @@ -96,15 +89,25 @@ class JDBCIntegrationTest extends CompileTestUtils { val beanSerializer = new ScalaBeanSerializer() val exporter = new MetaDataExporter() exporter.setNamePrefix("Q") - exporter.setPackageName("test") - exporter.setTargetFolder(new File("target/gen2")) + exporter.setPackageName("com.mysema") + val directory = new File("target/gen2") + exporter.setTargetFolder(directory) exporter.setSerializerClass(classOf[ScalaMetaDataSerializer]) exporter.setBeanSerializer(beanSerializer) exporter.setCreateScalaSources(true) exporter.setTypeMappings(ScalaTypeMappings.create) + exporter.setSchemaPattern("PUBLIC") exporter.export(connection.getMetaData) - // TODO : compile sources + assertCompileSuccess(recursiveFileList(directory)) + } + + private def recursiveFileList(file: File): Array[File] = { + if (file.isDirectory) { + file.listFiles.flatMap(recursiveFileList(_)) + } else { + Array(file) + } } @Test