This commit is contained in:
Timo Westkämper 2011-03-04 15:15:24 +00:00
parent c842fef5c8
commit ac3d89601b
4 changed files with 7 additions and 11 deletions

View File

@ -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) {"));

View File

@ -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();

View File

@ -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

View File

@ -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"));