Skip to main content

[el-spec commits] [el-spec~source-code:39] resolve conflicts

  • From: kchung@...
  • To: commits@...
  • Subject: [el-spec commits] [el-spec~source-code:39] resolve conflicts
  • Date: Tue, 17 Jan 2012 17:57:20 +0000

Project:    el-spec
Repository: source-code
Revision:   39
Author:     kchung
Date:       2012-01-17 17:57:16 UTC
Link:       

Log Message:
------------
resolve conflicts



Revisions:
----------
39


Modified Paths:
---------------
trunk/impl/src/test/java/org/glassfish/el/test/Customer.java
trunk/impl/src/test/java/org/glassfish/el/test/Order.java
trunk/impl/src/test/java/org/glassfish/el/test/LinqTest.java
trunk/impl/src/test/java/org/glassfish/el/test/Product.java
trunk/impl/src/test/java/org/glassfish/el/test/DataBase.java


Diffs:
------
Index: trunk/impl/src/test/java/org/glassfish/el/test/Product.java
===================================================================
--- trunk/impl/src/test/java/org/glassfish/el/test/Product.java (revision 38)
+++ trunk/impl/src/test/java/org/glassfish/el/test/Product.java (revision 39)
@@ -19,10 +19,8 @@
     }
 
     public String toString() {
-        return "Product: id=" + productID + ", name=" + name +
-            ", category=" +
-            category + ", unitPrice=" + unitPrice + ", unitsInStock=" +
-            unitsInStock;
+        return "Product: " + productID + ", " + name + ", " +
+            category + ", " + unitPrice + ", " + unitsInStock;
     }
 
     public int getProductID() { return productID; }
Index: trunk/impl/src/test/java/org/glassfish/el/test/Customer.java
===================================================================
--- trunk/impl/src/test/java/org/glassfish/el/test/Customer.java        
(revision 38)
+++ trunk/impl/src/test/java/org/glassfish/el/test/Customer.java        
(revision 39)
@@ -23,6 +23,11 @@
         this.orders = new ArrayList<Order>();
     }
 
+    public String toString() {
+        return "Customer: " + customerID + ", " + name + ", " + city + ", " +
+                country;
+    }
+
     public int getCustomerID() { return customerID;}
     public String getName() { return name;}
     public String getAddress() { return address; }
Index: trunk/impl/src/test/java/org/glassfish/el/test/LinqTest.java
===================================================================
--- trunk/impl/src/test/java/org/glassfish/el/test/LinqTest.java        
(revision 38)
+++ trunk/impl/src/test/java/org/glassfish/el/test/LinqTest.java        
(revision 39)
@@ -150,6 +150,15 @@
         }
         assertTrue(indx == 3);
     }
+
+    @Test
+    public void testTake() {
+        ret = elp.getValue("products.orderByDescending(p->p.unitPrice)." +
+                           "take(3)");
+        for (Object item: (Iterable) ret) {
+            p(item.toString());
+        }
+    }
     
     @Test
     public void testJoin() {
Index: trunk/impl/src/test/java/org/glassfish/el/test/DataBase.java
===================================================================
--- trunk/impl/src/test/java/org/glassfish/el/test/DataBase.java        
(revision 38)
+++ trunk/impl/src/test/java/org/glassfish/el/test/DataBase.java        
(revision 39)
@@ -66,8 +66,6 @@
 
     void o(int customerID, Date orderDate, double total) {
         Order order = new Order(curOrder++, customerID, orderDate, total);
-        System.out.println("### order = " + curOrder + ", customer = " +
-            customerID);
         this.orders.add(order);
         findCustomer(customerID).getOrders().add(order);
     }
Index: trunk/impl/src/test/java/org/glassfish/el/test/Order.java
===================================================================
--- trunk/impl/src/test/java/org/glassfish/el/test/Order.java   (revision 38)
+++ trunk/impl/src/test/java/org/glassfish/el/test/Order.java   (revision 39)
@@ -17,8 +17,8 @@
     }
 
     public String toString() {
-        return "Order: orderID = " + orderID + " customerID = " + customerID 
+
-            " orderDate = " + orderDate + " total = " + total;
+        return "Order: " + orderID + ", " + customerID +
+            ", " + orderDate.getYear() + ", " + total;
     }
 
     public int getOrderID() { return orderID; }





[el-spec commits] [el-spec~source-code:39] resolve conflicts

kchung 01/17/2012
 
 
Close
loading
Please Confirm
Close