From 4b1b778828a131c335233274f2000bf3c07975af Mon Sep 17 00:00:00 2001
From: Sara Prifti <72574638+sarapr97@users.noreply.github.com>
Date: Thu, 26 May 2022 23:19:14 +0200
Subject: [PATCH] different cases for buyTickets Tests Work!
---
src/main/java/de/rwth/swc/sqa/DataService.java | 10 ++++++++++
src/test/java/de/rwth/swc/sqa/TicketTest.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/rwth/swc/sqa/DataService.java b/src/main/java/de/rwth/swc/sqa/DataService.java
index 1a415cf..81d8c6c 100644
--- a/src/main/java/de/rwth/swc/sqa/DataService.java
+++ b/src/main/java/de/rwth/swc/sqa/DataService.java
@@ -74,6 +74,16 @@ public class DataService {
return isValid;
}
+ public static boolean discountCanBeAppliedOnTheTicket(Ticket ticket){
+ boolean applyDiscount=false;
+ if(ticket.getValidFor().getValue().equals("30d") || ticket.getValidFor().getValue().equals("1y")){
+ if(ticket.getDiscountCard()==true){
+ applyDiscount=true;
+ }
+ }
+ return applyDiscount;
+ }
+
//check if the discountCard can be applied for the requested ticket
public static boolean discountCanBeApplied(DiscountCard discountCard, TicketValidationRequest ticketValidationRequest){
boolean applyDiscount=false;
diff --git a/src/test/java/de/rwth/swc/sqa/TicketTest.java b/src/test/java/de/rwth/swc/sqa/TicketTest.java
index 43532df..d430f1b 100644
--- a/src/test/java/de/rwth/swc/sqa/TicketTest.java
+++ b/src/test/java/de/rwth/swc/sqa/TicketTest.java
@@ -50,7 +50,7 @@ public class TicketTest {
parms1.put("validFor", "1d");
parms1.put("zone", "A");
parms1.put("student", false);
- parms1.put("discountCard", true);
+ parms1.put("discountCard", false);
parms1.put("disabled", true);
parms1.put("validFrom", "2022-05-20 10:00:00");
RestAssured.given().header("content-Type", "application/json").and()
--
GitLab