From fd4e11353c6470841cd301ecc48c29650196a6e4 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 27 Feb 2017 15:19:50 +0100
Subject: [PATCH] additional complex appointment type added
---
.../appointment/parse/AppointmentTypeCollection.java | 5 ++++-
.../test/java/smash/appointment/parse/CellParserTest.java | 8 ++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/appointment-import/src/main/java/smash/appointment/parse/AppointmentTypeCollection.java b/appointment-import/src/main/java/smash/appointment/parse/AppointmentTypeCollection.java
index dd8edeae..c4fdcc15 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/AppointmentTypeCollection.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/AppointmentTypeCollection.java
@@ -15,13 +15,16 @@ public enum AppointmentTypeCollection {
LEVEL_B_BG(new AppointmentType[] { AppointmentType.LEVEL_B, AppointmentType.LEVEL_BG }, //
new String[] { "level B + BG" }), //
+ LEVEL_B_BV(new AppointmentType[] { AppointmentType.LEVEL_B, AppointmentType.LEVEL_BV }, //
+ new String[] { "level B + BV" }), //
+
LEVEL_BV_BG_SB_MPOWER(
new AppointmentType[] { AppointmentType.LEVEL_BV, AppointmentType.LEVEL_BG, AppointmentType.LEVEL_SB, AppointmentType.LEVEL_B_M_POWER, }, //
new String[] { "evel BV + BG + SB + mPower", "BV + BG + SB + mPower" }), //
LEVEL_BG_SB_MPOWER(
new AppointmentType[] { AppointmentType.LEVEL_BG, AppointmentType.LEVEL_SB, AppointmentType.LEVEL_B_M_POWER, }, //
- new String[] { "BG + SB + mPower" }), //
+ new String[] { "level BG + SB + mPower" }), //
LEVEL_BV_BG_SB(new AppointmentType[] { AppointmentType.LEVEL_BV, AppointmentType.LEVEL_BG, AppointmentType.LEVEL_SB }, //
new String[] { "evel BV + BG + SB", "BV + BG + SB" }), //
LEVEL_BV_SB(new AppointmentType[] { AppointmentType.LEVEL_BV, AppointmentType.LEVEL_SB }, //
diff --git a/appointment-import/src/test/java/smash/appointment/parse/CellParserTest.java b/appointment-import/src/test/java/smash/appointment/parse/CellParserTest.java
index e86d16d2..757161d3 100644
--- a/appointment-import/src/test/java/smash/appointment/parse/CellParserTest.java
+++ b/appointment-import/src/test/java/smash/appointment/parse/CellParserTest.java
@@ -75,6 +75,14 @@ public class CellParserTest extends TestBase {
new CellParseTestCase(
"Gawron Piotr level BG + SB + M-Power", piotrGawron, null,
new AppointmentType[] { AppointmentType.LEVEL_BG, AppointmentType.LEVEL_SB, AppointmentType.LEVEL_B_M_POWER }));
+
+ testCases.add(
+ new CellParseTestCase("Gawron Piotr level B + BV", piotrGawron, null, new AppointmentType[] { AppointmentType.LEVEL_B, AppointmentType.LEVEL_BV }));
+ testCases.add(
+ new CellParseTestCase(
+ "Gawron Piotr level BG + SB + M-Power", piotrGawron, null,
+ new AppointmentType[] { AppointmentType.LEVEL_BG, AppointmentType.LEVEL_SB, AppointmentType.LEVEL_B_M_POWER }));
+
}
@Test
--
GitLab