From 76ee2d6690252d8d18751bc8c88005bf9cf061c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 8 Sep 2010 20:37:25 +0000
Subject: [PATCH]

---
 .../com/mysema/query/scala/Conversions.scala  |  2 ++
 .../com/mysema/query/scala/AliasTest.scala    | 33 +++++++++++++++++--
 .../mysema/query/scala/ExpressionTest.scala   |  2 +-
 .../mysema/query/scala/QuerySyntaxTest.scala  |  4 +--
 .../query/scala/ScalaBeanSerializerTest.scala |  2 +-
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
index 424277803..9d0ed2627 100644
--- a/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
+++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/Conversions.scala
@@ -17,6 +17,8 @@ object Conversions {
     
     def not(b: EBoolean): EBoolean = b.not()
     
+    implicit def _simple(s: Object): PSimple[_] = $(s);
+    
     implicit def _boolean(b: Boolean): PBoolean = $(b);
     
     implicit def _string(s: String): PString = $(s);
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 1a49f4eb8..00815470a 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
@@ -2,6 +2,7 @@ package com.mysema.query.scala
 
 import com.mysema.query.alias.Alias._
 import com.mysema.query.types.path._
+import com.mysema.query.sql.SQLSubQuery
 
 import com.mysema.query.scala.Conversions._
 
@@ -14,12 +15,12 @@ class AliasTest {
     var domainType = alias(classOf[DomainType])
     
     @Test
-    def test(){        
+    def Explicit_Cast(){        
         assertEquals("domainType.firstName", $(domainType.firstName).toString);
     }
     
     @Test
-    def implicitDefs1(){
+    def Implicit_Cast1(){
         var path: PString = domainType.firstName;
         assertEquals("domainType.firstName like Hello", (path like "Hello").toString());
         assertEquals("domainType.firstName ASC",        (path asc).toString());       
@@ -28,7 +29,7 @@ class AliasTest {
     }
     
     @Test
-    def implicitDefs2(){
+    def Implicit_Cast2(){
         assertEquals("domainType.firstName like Hello", (domainType.firstName like "Hello").toString());
         assertEquals("domainType.firstName ASC",        (domainType.firstName asc).toString());
         
@@ -52,6 +53,32 @@ class AliasTest {
 //        assertEquals("domainType.firstName != Hello",   (domainType.firstName ne "Hello").toString());
     }
     
+    //@Test
+    def Expression_in_SubQuery(){
+        // list
+        query().from (domainType) 
+          .where (domainType.firstName like "Rob%")                
+          .orderBy (domainType.firstName asc)
+          .list ($(domainType));            // FIXME
+        
+        // unique result
+        query().from (domainType) 
+          .where (domainType.firstName like "Rob%")                
+          .orderBy (domainType.firstName asc)
+          .unique ($(domainType));            // FIXME
+        
+        // long where
+        query().from (domainType) 
+          .where (
+              domainType.firstName like "Rob%",
+              domainType.lastName like "An%"
+           )                
+          .orderBy (domainType.firstName asc)
+          .list ($(domainType));            // FIXME
+    }
+    
+    def query() = new SQLSubQuery();
+    
 }
 
 class DomainType {    
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala
index 4155e554e..d2ab96d49 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala
+++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/ExpressionTest.scala
@@ -11,7 +11,7 @@ class ExpressionTest {
    var num = new PNumber(classOf[Integer],"num");
        
    @Test
-   def operations(){
+   def Operations(){
        // string
        assertEquals("str = a",  (str eq "a").toString);
        assertEquals("str != a", (str ne "a").toString);
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/QuerySyntaxTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/QuerySyntaxTest.scala
index 57d44ab7a..abcbf9ba0 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/QuerySyntaxTest.scala
+++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/QuerySyntaxTest.scala
@@ -7,7 +7,7 @@ import org.junit.Assert._
 class QuerySyntaxTest {
     
     @Test
-    def querySyntax(){
+    def Query_Syntax(){
 //      select()
 //          .from(Category as "c" join (Book as "b"), Category as "c1")
 //          .where("c1.name" like "a%")
@@ -29,7 +29,7 @@ class QuerySyntaxTest {
     }
     
     @Test
-    def keyUsage(){
+    def Key_Usage(){
         val user = new QUser("user");
         val user2 = new QUser("user2");
         val department = new QDepartment("department");
diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaBeanSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaBeanSerializerTest.scala
index 5c2a5b6b7..724d4183d 100644
--- a/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaBeanSerializerTest.scala
+++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/ScalaBeanSerializerTest.scala
@@ -50,7 +50,7 @@ class ScalaBeanSerializerTest {
 
     @Test
     @throws(classOf[java.io.IOException])
-    def test(){
+    def Print(){
         var serializer = new ScalaBeanSerializer();
         serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer));
         var str = writer.toString();