From c8ad401d8fb8f253e92096925b855fb5d688a3ea Mon Sep 17 00:00:00 2001
From: Vesa Martilla <vesa.marttila@mysema.com>
Date: Thu, 23 Sep 2010 13:38:08 +0000
Subject: [PATCH] AliasTest: Arranged tests into smaller functions and added a
 few cases.

---
 .../com/mysema/query/scala/AliasTest.scala    | 250 ++++++++++--------
 1 file changed, 139 insertions(+), 111 deletions(-)

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 07c31a49a..9c31d0adc 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
@@ -3,156 +3,184 @@ package com.mysema.query.scala;
 import com.mysema.query.scala.Conversions._
 import com.mysema.query.sql.SQLSubQuery
 
+import com.mysema.query.types.Expression
 import com.mysema.query.types.path._
 import org.junit.Test
-import org.junit.Assert._
 
 class AliasTest {
 
   var domainType = alias(classOf[DomainType])
 
-  @Test
-  def Path_eq_Path() {
-    assertEquals("domainType.firstName = domainType.lastName", 
-      (domainType.firstName $eq domainType.lastName).toString);
+  def assertEquals(expected: String, actual: Any) {
+    org.junit.Assert.assertEquals(expected, actual.toString);
   }
-  
+
   @Test
-  def String_Usage() {
-    // eq, ne
-    assertEquals("domainType.firstName = Hello", (domainType.firstName $eq "Hello").toString);
-    assertEquals("domainType.firstName != Hello", (domainType.firstName $ne "Hello").toString);
-    assertEquals("domainType.firstName != Hello", (domainType.firstName $ne "Hello").toString);
+  def Path_Equality {
+    assertEquals("domainType.firstName = domainType.lastName", domainType.firstName $eq domainType.lastName);
+  }
 
-    assertEquals("domainType.firstName like Hello", (domainType.firstName $like "Hello").toString);
-    assertEquals("domainType.firstName ASC", (domainType.firstName asc).toString());
+  @Test
+  def String_Equality {
+    assertEquals("domainType.firstName = Hello", domainType.firstName $eq "Hello");
+    assertEquals("domainType.firstName != Hello", domainType.firstName $ne "Hello");
+    assertEquals("domainType.firstName != Hello", domainType.firstName $ne "Hello");
+  }
 
-    // append
-    assertEquals("domainType.firstName + x", (domainType.firstName $append "x").toString);
-    assertEquals("domainType.firstName + x", (domainType.firstName $append "x").toString);
+  @Test
+  def String_Like {
+    assertEquals("domainType.firstName like Hello", domainType.firstName $like "Hello");
+  }
 
-    // and
+  @Test
+  def String_Order {
+    assertEquals("domainType.firstName ASC", domainType.firstName asc);
+  }
+
+  @Test
+  def String_Append {
+    assertEquals("domainType.firstName + x", domainType.firstName $append "x");
+    assertEquals("domainType.firstName +   + domainType.lastName", domainType.firstName $append " " $append domainType.lastName);
+  }
+
+  @Test
+  def String_And {
     var andClause = (domainType.firstName $like "An%") $and (domainType.firstName $like "Be%");
-    assertEquals("domainType.firstName like An% && domainType.firstName like Be%", andClause.toString);
+    assertEquals("domainType.firstName like An% && domainType.firstName like Be%", andClause);
+  }
 
-    // or
+  @Test
+  def String_Or {
     var orClause = (domainType.firstName $like "An%") $or (domainType.firstName $like "Be%");
-    assertEquals("domainType.firstName like An% || domainType.firstName like Be%", orClause.toString);
+    assertEquals("domainType.firstName like An% || domainType.firstName like Be%", orClause);
+  }
 
-    // not
+  @Test
+  def String_Not {
     var notClause = (domainType.firstName $like "An%") not;
     assertEquals("!domainType.firstName like An%", notClause.toString);
 
     notClause = not(domainType.firstName $like "An%");
     assertEquals("!domainType.firstName like An%", notClause.toString);
-
-    // trim
-    assertEquals("trim(domainType.firstName)", (domainType.firstName $trim).toString);
-
-    // isEmpty
-    assertEquals("empty(domainType.firstName)", (domainType.firstName $isEmpty).toString);
   }
 
   @Test
-  def Number_Usage() {
-    // lt
-    assertEquals("domainType.scalaInt < 5", (domainType.scalaInt $lt 5).toString);
-    assertEquals("domainType.javaInt < 5", (domainType.javaInt $lt 5).toString);
-    
-    assertEquals("domainType.scalaInt < domainType.javaInt", (domainType.scalaInt $lt domainType.javaInt).toString);
-    
-    // between
-    // FIXME
-    assertEquals("domainType.scalaInt between 2 and 3", (domainType.scalaInt $between (2, 3)).toString);
-    assertEquals("domainType.javaInt between 2 and 3", (domainType.javaInt $between (2, 3)).toString);
-    
-    // FIXME
-//    assertEquals("domainType.scalaInt between domainType.javaInt and domainType.javaDouble", 
-//                 (domainType.scalaInt $between (domainType.javaInt, domainType.javaDouble)).toString);
-    
-    assertEquals("domainType.scalaInt between domainType.javaInt and domainType.javaDouble", 
-                 (domainType.scalaInt $between (domainType.javaInt.~, domainType.javaDouble.~)).toString); 
-    
-    // arithmetic
-    assertEquals("domainType.scalaInt + 3", (domainType.scalaInt $add 3).toString);
-    assertEquals("domainType.scalaInt - 3", (domainType.scalaInt $subtract 3).toString);
-    assertEquals("domainType.scalaInt / 3", (domainType.scalaInt $divide 3).toString);
-    assertEquals("domainType.scalaInt * 3", (domainType.scalaInt $multiply 3).toString);
-    assertEquals("domainType.scalaInt * -1", (domainType.scalaInt $negate).toString);
-    assertEquals("domainType.scalaInt % 4", (domainType.scalaInt $mod 4).toString);
-    assertEquals("domainType.scalaInt + domainType.javaInt", (domainType.scalaInt $add domainType.javaInt).toString);
-    
-    assertEquals("round(domainType.scalaInt)", (domainType.scalaInt $round).toString);
-    assertEquals("floor(domainType.scalaInt)", (domainType.scalaInt $floor).toString);
-    assertEquals("ceil(domainType.scalaInt)", (domainType.scalaInt $ceil).toString);
-
-    // casts
-    assertEquals("cast(domainType.javaInt,class java.lang.Long)", (domainType.javaInt $longValue).toString);
-    assertEquals("cast(domainType.scalaInt,class java.lang.Long)", (domainType.scalaInt $longValue).toString);
-
-    // sqrt
-    assertEquals("sqrt(domainType.scalaInt)", (domainType.scalaInt $sqrt).toString);
+  def String_Trim {
+    assertEquals("trim(domainType.firstName)", domainType.firstName $trim);
   }
 
   @Test
-  def Java_Collection_Usage() {
-    // size
-    assertEquals("size(domainType.javaCollection)", (domainType.javaCollection $size).toString);
-    assertEquals("size(domainType.javaSet)", (domainType.javaSet $size).toString);
-    assertEquals("size(domainType.javaList)", (domainType.javaList $size).toString);
-    assertEquals("size(domainType.javaMap)", (domainType.javaMap $size).toString);
-
-    // is Empty
-    assertEquals("empty(domainType.javaCollection)", (domainType.javaCollection $isEmpty).toString);
-    assertEquals("empty(domainType.javaSet)", (domainType.javaSet $isEmpty).toString);
-    assertEquals("empty(domainType.javaList)", (domainType.javaList $isEmpty).toString);
-    assertEquals("empty(domainType.javaMap)", (domainType.javaMap $isEmpty).toString);
-
-    // get
-    assertEquals("domainType.javaList.get(0) is not null", (domainType.javaList.get(0) $isNotNull).toString);
-    assertEquals("domainType.javaMap.get(xxx) is null", (domainType.javaMap.get("xxx") $isNull).toString);
-
-    // get + like
-    assertEquals("startsWith(domainType.javaMap.get(xxx),X)", (domainType.javaMap.get("xxx") $startsWith "X").toString);
+  def String_Is_Empty {
+    assertEquals("empty(domainType.firstName)", domainType.firstName $isEmpty);
   }
 
   @Test
-  def Scala_Collection_Usage() {
-    // size
-    assertEquals("size(domainType.scalaList)", (domainType.scalaList $size).toString);
-    assertEquals("size(domainType.scalaMap)", (domainType.scalaMap $size).toString);
-
-    // is Empty
-    assertEquals("empty(domainType.scalaList)", (domainType.scalaList $isEmpty).toString);
-    assertEquals("empty(domainType.scalaMap)", (domainType.scalaMap $isEmpty).toString);
-
-    // get
-    assertEquals("domainType.scalaList.get(0) is not null", (domainType.scalaList(0) $isNotNull).toString);
-    assertEquals("domainType.scalaList.get(0) is not null", (domainType.scalaList(0) $isNotNull).toString);
-    assertEquals("domainType.scalaMap.get(xxx) is null", (domainType.scalaMap("xxx") $isNull).toString);
-
-    // contains
-    assertEquals("X in domainType.scalaList", (domainType.scalaList $contains "X").toString);
-    assertEquals("X in domainType.javaList", (domainType.javaList $contains "X").toString);
-
-    // get + like
-    assertEquals("startsWith(domainType.scalaMap.get(xxx),X)", (domainType.scalaMap("xxx") $startsWith "X").toString);
+  def Number_Comparison {
+    assertEquals("domainType.scalaInt < 5", domainType.scalaInt $lt 5);
+    assertEquals("domainType.javaInt < 5", domainType.javaInt $lt 5);
+    assertEquals("domainType.javaInt > 5", domainType.javaInt $gt 5);
+    assertEquals("domainType.javaInt <= 5", domainType.javaInt $loe 5);
+    assertEquals("domainType.javaInt >= 5", domainType.javaInt $goe 5);
+    assertEquals("domainType.javaInt = 5", domainType.javaInt $eq 5);
+    assertEquals("domainType.javaInt != 5", domainType.javaInt $ne 5);
   }
 
   @Test
-  def Array_Usage() {
-    assertEquals("size(domainType.array)", (domainType.array $size).toString);
+  def Number_Between {
+    assertEquals("domainType.scalaInt between 2 and 3", domainType.scalaInt $between (2, 3));
+    assertEquals("domainType.javaInt between 2 and 3", domainType.javaInt $between (2, 3));
   }
-    
+
+  @Test
+  def Number_Arithmetic {
+    assertEquals("domainType.scalaInt + 3", domainType.scalaInt $add 3);
+    assertEquals("domainType.scalaInt - 3", domainType.scalaInt $subtract 3);
+    assertEquals("domainType.scalaInt / 3", domainType.scalaInt $divide 3);
+    assertEquals("domainType.scalaInt * 3", domainType.scalaInt $multiply 3);
+    assertEquals("domainType.scalaInt * -1", domainType.scalaInt $negate);
+    assertEquals("domainType.scalaInt % 4", domainType.scalaInt $mod 4);
+    assertEquals("round(domainType.scalaInt)", domainType.scalaInt $round);
+    assertEquals("floor(domainType.scalaInt)", domainType.scalaInt $floor);
+    assertEquals("ceil(domainType.scalaInt)", domainType.scalaInt $ceil);
+    assertEquals("sqrt(domainType.scalaInt)", domainType.scalaInt $sqrt);
+  }
+
+  @Test
+  def Number_Casts {
+    assertEquals("cast(domainType.javaInt,class java.lang.Long)", domainType.javaInt $longValue);
+    assertEquals("cast(domainType.scalaInt,class java.lang.Long)", domainType.scalaInt $longValue);
+  }
+
+  @Test
+  def Java_Collections_Size {
+    assertEquals("size(domainType.javaCollection)", domainType.javaCollection $size);
+    assertEquals("size(domainType.javaSet)", domainType.javaSet $size);
+    assertEquals("size(domainType.javaList)", domainType.javaList $size);
+    assertEquals("size(domainType.javaMap)", domainType.javaMap $size);
+  }
+
+  @Test
+  def Java_Collections_Is_Empty {
+    assertEquals("empty(domainType.javaCollection)", domainType.javaCollection $isEmpty);
+    assertEquals("empty(domainType.javaSet)", domainType.javaSet $isEmpty);
+    assertEquals("empty(domainType.javaList)", domainType.javaList $isEmpty);
+    assertEquals("empty(domainType.javaMap)", domainType.javaMap $isEmpty);
+  }
+
+  @Test
+  def Java_Collections_Get {
+    assertEquals("domainType.javaList.get(0) is not null", domainType.javaList.get(0) $isNotNull);
+    assertEquals("domainType.javaMap.get(xxx) is null", domainType.javaMap.get("xxx") $isNull);
+  }
+
+  @Test
+  def Java_Collections_Get_And_Starts_With {
+    assertEquals("startsWith(domainType.javaMap.get(xxx),X)", domainType.javaMap.get("xxx") $startsWith "X");
+  }
+
+  @Test
+  def Scala_Collections_Size {
+    assertEquals("size(domainType.scalaList)", domainType.scalaList $size);
+    assertEquals("size(domainType.scalaMap)", domainType.scalaMap $size);
+  }
+
+  @Test
+  def Scala_Collections_Is_Empty {
+    assertEquals("empty(domainType.scalaList)", domainType.scalaList $isEmpty);
+    assertEquals("empty(domainType.scalaMap)", domainType.scalaMap $isEmpty);
+  }
+
+  @Test
+  def Scala_Collections_Get {
+    assertEquals("domainType.scalaList.get(0) is not null", domainType.scalaList(0) $isNotNull);
+    assertEquals("domainType.scalaList.get(0) is not null", domainType.scalaList(0) $isNotNull);
+    assertEquals("domainType.scalaMap.get(xxx) is null", domainType.scalaMap("xxx") $isNull);
+  }
+
+  @Test
+  def Scala_Collections_Contains {
+    assertEquals("X in domainType.scalaList", domainType.scalaList $contains "X");
+    assertEquals("X in domainType.javaList", domainType.javaList $contains "X");
+  }
+
+  @Test
+  def Scala_Collections_Get_And_Starts_With {
+    assertEquals("startsWith(domainType.scalaMap.get(xxx),X)", domainType.scalaMap("xxx") $startsWith "X");
+  }
+
+  @Test
+  def Array_Size {
+    assertEquals("size(domainType.array)", domainType.array $size ());
+  }
+
   @Test
   def Complex_Expressions() {
-      var str = ((domainType.firstName $startsWith domainType.lastName) 
+      val expr = ((domainType.firstName $startsWith domainType.lastName) 
           $and (domainType.javaInt $lt domainType.scalaInt) 
-          $or (domainType.javaDouble $isNull)).toString;
+          $or (domainType.javaDouble $isNull));
       assertEquals("startsWith(domainType.firstName,domainType.lastName) " +
          "&& domainType.javaInt < domainType.scalaInt " +
-         "|| domainType.javaDouble is null", str);
+         "|| domainType.javaDouble is null", expr);
   }
-
 }