Base class for various tests that use the test DSL

diff --git a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
index a4df60a..826422e 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
@@ -40,16 +40,7 @@ import org.junit.{Test}
 import gr.grnet.aquarium.logic.accounting.dsl._
 import gr.grnet.aquarium.util.TestMethods
 
-class DSLTest extends DSL with TestMethods {
-
-  var creditpolicy : DSLPolicy = _
-
-  def before = {
-    creditpolicy = parse(
-      getClass.getClassLoader.getResourceAsStream("policy.yaml")
-    )
-    assertNotNull(creditpolicy)
-  }
+class DSLTest extends DSLTestBase with TestMethods {
 
   @Test
   def testParsePolicies = {

diff --git a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
index f31a5c1..e93c7c9 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
@@ -1,11 +1,56 @@
+/*
+ * Copyright 2011 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ */
+
 package gr.grnet.aquarium.logic.test
 
+import org.junit.Assert._
+import gr.grnet.aquarium.logic.accounting.dsl.{DSL, DSLPolicy}
+
 /**
- * 
+ * Base class for tests that require access to a DSL description.
  *
  * @author Georgios Gousios <gousiosg@gmail.com>
  */
 
-class DSLTestBase {
+class DSLTestBase extends DSL {
+  var creditpolicy: DSLPolicy = _
 
+  def before = {
+    creditpolicy = parse(
+      getClass.getClassLoader.getResourceAsStream("policy.yaml")
+    )
+    assertNotNull(creditpolicy)
+  }
 }
\ No newline at end of file

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 2157bec..86b72d9 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
@@ -37,12 +37,12 @@ package gr.grnet.aquarium.logic.test
 
 import org.junit.Test
 import org.junit.Assert._
-import java.util.Date
 import gr.grnet.aquarium.util.TestMethods
 import gr.grnet.aquarium.logic.accounting.dsl._
 import annotation.tailrec
+import java.util.Date
 
-class DSLUtilsTest extends DSLUtils with TestMethods with DSL {
+class DSLUtilsTest extends DSLTestBase with DSLUtils with TestMethods {
 
   @Test
   def testExpandTimeSpec = {
@@ -149,7 +149,7 @@ class DSLUtilsTest extends DSLUtils with TestMethods with DSL {
     var result = ineffectiveTimeslots(repeat, from, Some(to))
     assertEquals(30, result.size)
     testSuccessiveTimeslots(result)
-    printTimeslots(result)
+    //printTimeslots(result)
   }
 
   @Test