From ac3d89601ba4479ed3d7fd5ad91695c0413617ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 4 Mar 2011 15:15:24 +0000 Subject: [PATCH] --- .../com/mysema/query/scala/ScalaEntitySerializerTest.scala | 4 ++-- .../com/mysema/query/scala/sql/JDBCIntegrationTest.scala | 4 ++-- .../mysema/query/scala/sql/ScalaBeanSerializerTest.scala | 6 +----- .../query/scala/sql/ScalaMetaDataSerializerTest.scala | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaEntitySerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaEntitySerializerTest.scala index a724bde91..60100d2f1 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaEntitySerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaEntitySerializerTest.scala @@ -24,7 +24,7 @@ class ScalaEntitySerializerTest { @Before def setUp() { val typeModel = new ClassType(TypeCategory.ENTITY, classOf[Person]); - entityType = new EntityType("Q", "", typeModel); + entityType = new EntityType(typeModel); entityType.addProperty(new Property(entityType, "scalaInt", Types.INTEGER)); entityType.addProperty(new Property(entityType, "javaInt", Types.INTEGER)); entityType.addProperty(new Property(entityType, "javaDouble", Types.DOUBLE)); @@ -44,7 +44,7 @@ class ScalaEntitySerializerTest { @Test def Print() { - val serializer = new ScalaEntitySerializer("Q", ""); + val serializer = new ScalaEntitySerializer(); serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)); val str = writer.toString(); assertTrue(str.contains("class QPerson(cl: Class[_ <: Person], md: PathMetadata[_]) extends EntityPathImpl[Person](cl, md) {")); 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 848ef0554..9c3417fb6 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 @@ -56,7 +56,7 @@ class JDBCIntegrationTest { @Test def Generation_without_Beantypes() { val namingStrategy = new DefaultNamingStrategy(); - val serializer = new ScalaMetaDataSerializer("Q", "", namingStrategy); + val serializer = new ScalaMetaDataSerializer(namingStrategy); //val exporter = new MetaDataExporter("Q", "test", new File("target/gen1"), namingStrategy, serializer); val exporter = new MetaDataExporter(); exporter.setNamePrefix("Q"); @@ -70,7 +70,7 @@ class JDBCIntegrationTest { @Test def Generation_with_Beantypes() { val namingStrategy = new DefaultNamingStrategy(); - val serializer = new ScalaMetaDataSerializer("Q", "", namingStrategy); + val serializer = new ScalaMetaDataSerializer(namingStrategy); val beanSerializer = new ScalaBeanSerializer(); //val exporter = new MetaDataExporter("Q", "test", new File("target/gen2"), namingStrategy, serializer, beanSerializer); val exporter = new MetaDataExporter(); diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaBeanSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaBeanSerializerTest.scala index 286f04f58..64637e8e5 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaBeanSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaBeanSerializerTest.scala @@ -22,7 +22,7 @@ class ScalaBeanSerializerTest { def setUp() { // type val typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false, false); - entityType = new EntityType("Q", "", typeModel); + entityType = new EntityType(typeModel); // property entityType.addProperty(new Property(entityType, "entityField", entityType, new Array[String](0))); @@ -42,10 +42,6 @@ class ScalaBeanSerializerTest { val firstName = new Parameter("firstName", new ClassType(TypeCategory.STRING, classOf[String])); val lastName = new Parameter("lastName", new ClassType(TypeCategory.STRING, classOf[String])); entityType.addConstructor(new Constructor(List(firstName, lastName))); - - // method - val method = new Method(Types.STRING, "method", "abc", Types.STRING); - entityType.addMethod(method); } @Test diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializerTest.scala index 52feb368a..d3277934d 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/ScalaMetaDataSerializerTest.scala @@ -24,7 +24,7 @@ class ScalaMetaDataSerializerTest { def setUp() { // type val typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false, false); - entityType = new EntityType("Q", "", typeModel); + entityType = new EntityType(typeModel); entityType.addAnnotation(new TableImpl("DOMAIN_TYPE")); // properties @@ -38,7 +38,7 @@ class ScalaMetaDataSerializerTest { @Test def Print { val namingStrategy = new DefaultNamingStrategy(); - val serializer = new ScalaMetaDataSerializer("Q", "", namingStrategy); + val serializer = new ScalaMetaDataSerializer(namingStrategy); serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer)); val str = writer.toString(); assertTrue("companion object isn't before class", str.indexOf("object") < str.indexOf("class"));