From: Georgios Gousios <gousiosg@gmail.com>
Date: Tue, 6 Dec 2011 09:00:11 +0000 (+0200)
Subject: Fix expected result in test case
X-Git-Tag: aquarium-0.1~298
X-Git-Url: https://code.grnet.gr/git/aquarium/commitdiff_plain/a6102a05d5b91561fb46b314e2fffd0a55cc9e5d?hp=46284713a6b4f4132b13e7a5d909cb3ecdfa7f21

Fix expected result in test case
---

diff --git a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
index bfb6b49..c9c074d 100644
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
@@ -215,6 +215,7 @@ class DSLUtilsTest extends DSLTestBase with DSLUtils with TestMethods {
     val ts3 = 1322660282000L //Wed, 30 Nov 2011 15:38:02 EET
     val ts4 = 1322667482000L //Wed, 30 Nov 2011 17:38:02 EET
     val ts5 = 1322689082000L //Wed, 30 Nov 2011 23:38:02 EET
+    val ts6 = 1322555880000L //Tue, 29 Nov 2011 10:38:00 EET
 
     var pricelists = resolveEffectivePricelistsForTimeslot(Timeslot(new Date(ts1), new Date(ts2)), agr)
     assertEquals(2, pricelists.keySet.size)
@@ -226,10 +227,15 @@ class DSLUtilsTest extends DSLTestBase with DSLUtils with TestMethods {
     assertEquals("default", pricelists.head._2.name)
 
     pricelists = resolveEffectivePricelistsForTimeslot(Timeslot(new Date(ts1), new Date(ts4)), agr)
-    //assertEquals(3, pricelists.keySet.size)
+    assertEquals(2, pricelists.keySet.size)
+    assertEquals("foobar", pricelists.head._2.name)
+    assertEquals("default", pricelists.tail.head._2.name)
 
     pricelists = resolveEffectivePricelistsForTimeslot(Timeslot(new Date(ts1), new Date(ts5)), agr)
-    //assertEquals(5, pricelists.keySet.size)
+    assertEquals(4, pricelists.keySet.size)
+
+    pricelists = resolveEffectivePricelistsForTimeslot(Timeslot(new Date(ts6), new Date(ts5)), agr)
+    assertEquals(9, pricelists.keySet.size)
   }
 
   @tailrec