Revision 29755f68

b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTest.scala
40 40
import gr.grnet.aquarium.logic.accounting.dsl._
41 41
import gr.grnet.aquarium.util.TestMethods
42 42

  
43
class DSLTest extends DSL with TestMethods {
44

  
45
  var creditpolicy : DSLPolicy = _
46

  
47
  def before = {
48
    creditpolicy = parse(
49
      getClass.getClassLoader.getResourceAsStream("policy.yaml")
50
    )
51
    assertNotNull(creditpolicy)
52
  }
43
class DSLTest extends DSLTestBase with TestMethods {
53 44

  
54 45
  @Test
55 46
  def testParsePolicies = {
b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLTestBase.scala
1
/*
2
 * Copyright 2011 GRNET S.A. All rights reserved.
3
 *
4
 * Redistribution and use in source and binary forms, with or
5
 * without modification, are permitted provided that the following
6
 * conditions are met:
7
 *
8
 *   1. Redistributions of source code must retain the above
9
 *      copyright notice, this list of conditions and the following
10
 *      disclaimer.
11
 *
12
 *   2. Redistributions in binary form must reproduce the above
13
 *      copyright notice, this list of conditions and the following
14
 *      disclaimer in the documentation and/or other materials
15
 *      provided with the distribution.
16
 *
17
 * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
18
 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
20
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
21
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
24
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
25
 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
26
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
27
 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28
 * POSSIBILITY OF SUCH DAMAGE.
29
 *
30
 * The views and conclusions contained in the software and
31
 * documentation are those of the authors and should not be
32
 * interpreted as representing official policies, either expressed
33
 * or implied, of GRNET S.A.
34
 */
35

  
1 36
package gr.grnet.aquarium.logic.test
2 37

  
38
import org.junit.Assert._
39
import gr.grnet.aquarium.logic.accounting.dsl.{DSL, DSLPolicy}
40

  
3 41
/**
4
 * 
42
 * Base class for tests that require access to a DSL description.
5 43
 *
6 44
 * @author Georgios Gousios <gousiosg@gmail.com>
7 45
 */
8 46

  
9
class DSLTestBase {
47
class DSLTestBase extends DSL {
48
  var creditpolicy: DSLPolicy = _
10 49

  
50
  def before = {
51
    creditpolicy = parse(
52
      getClass.getClassLoader.getResourceAsStream("policy.yaml")
53
    )
54
    assertNotNull(creditpolicy)
55
  }
11 56
}
b/logic/src/test/scala/gr/grnet/aquarium/logic/test/DSLUtilsTest.scala
37 37

  
38 38
import org.junit.Test
39 39
import org.junit.Assert._
40
import java.util.Date
41 40
import gr.grnet.aquarium.util.TestMethods
42 41
import gr.grnet.aquarium.logic.accounting.dsl._
43 42
import annotation.tailrec
43
import java.util.Date
44 44

  
45
class DSLUtilsTest extends DSLUtils with TestMethods with DSL {
45
class DSLUtilsTest extends DSLTestBase with DSLUtils with TestMethods {
46 46

  
47 47
  @Test
48 48
  def testExpandTimeSpec = {
......
149 149
    var result = ineffectiveTimeslots(repeat, from, Some(to))
150 150
    assertEquals(30, result.size)
151 151
    testSuccessiveTimeslots(result)
152
    printTimeslots(result)
152
    //printTimeslots(result)
153 153
  }
154 154

  
155 155
  @Test

Also available in: Unified diff