From 4adad8aae953fdca14dca621f7e970a9524eb3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 6 Oct 2010 19:31:37 +0000 Subject: [PATCH] --- .../com/mysema/query/scala/Expressions.scala | 2 +- .../com/mysema/query/scala/AliasTest.scala | 5 ++-- .../com/mysema/testutil/ImplicitsTest.scala | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 querydsl-scala/src/test/scala/com/mysema/testutil/ImplicitsTest.scala diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala index 0af6a1932..0b7aa4d0d 100644 --- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala +++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/Expressions.scala @@ -314,7 +314,7 @@ trait NumberExpression[T <: Number with Comparable[T]] extends ComparableExpress } -trait BooleanFunctions { +abstract trait BooleanFunctions { def and(right: Predicate): BooleanExpression; diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala index 7040c8b83..b2052b27c 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/AliasTest.scala @@ -101,8 +101,7 @@ class AliasTest { @Test def Number_Comparison2 { - val predicate: Predicate = person.scalaInt < 5; - assertEquals("person.scalaInt < 5", predicate); + assertEquals("person.scalaInt < 5", person.scalaInt < 5); assertEquals("person.javaInt < 5", person.javaInt < 5); assertEquals("person.javaInt > 5", person.javaInt > 5); assertEquals("person.javaInt <= 5", person.javaInt <= 5); @@ -196,7 +195,7 @@ class AliasTest { @Test def Array_Size { - val num: NumberExpression[Integer] = person.array size(); + val num: NumberExpression[Integer] = person.array size; assertEquals("size(person.array)", num); } diff --git a/querydsl-scala/src/test/scala/com/mysema/testutil/ImplicitsTest.scala b/querydsl-scala/src/test/scala/com/mysema/testutil/ImplicitsTest.scala new file mode 100644 index 000000000..a6edf7c18 --- /dev/null +++ b/querydsl-scala/src/test/scala/com/mysema/testutil/ImplicitsTest.scala @@ -0,0 +1,24 @@ +package com.mysema.testutil + +import org.junit.{ Test, Before, After }; +import org.junit.Assert._ + + +class ImplicitsTest { + + implicit def toStringWrapper(str: String) = new StringWrapper(str); + + @Test + def test(){ + val res1: Predicate = "str" startsWith "other"; + } + +} + +class StringWrapper(str: String){ + + def startsWith(other: String): Predicate = null; + +} + +trait Predicate \ No newline at end of file