From 97773c7b0180e859ec8cb0d5db3dc6068fa12497 Mon Sep 17 00:00:00 2001 From: hmalik144 Date: Fri, 19 Jul 2024 17:52:30 +0100 Subject: [PATCH] Tests complete --- .../kotlin/{ => org/example}/api/BookerApi.kt | 2 +- .../{ => org/example}/api/RestfulBookerApi.kt | 4 +- .../{ => org/example}/model/AuthRequest.kt | 2 +- .../{ => org/example}/model/AuthResponse.kt | 2 +- .../example}/model/BookingIdResponse.kt | 2 +- .../{ => org/example}/model/BookingRequest.kt | 2 +- .../example}/model/BookingResponse.kt | 2 +- .../{ => org/example}/model/Bookingdates.kt | 2 +- .../example}/model/CreateBookingResponse.kt | 2 +- .../example}/model/UpdateBookingRequest.kt | 2 +- .../example}/storage/OrdersDatabase.kt | 6 +-- src/main/resources/Log4j2.xml | 4 +- .../kotlin/{ => org/example}/NetworkTests.kt | 2 + src/test/kotlin/{ => org/example}/Tests.kt | 54 +++++++------------ .../{ => org/example}/utils/FileReader.kt | 2 +- src/test/resources/reportTemplate.jrxml | 28 ---------- 16 files changed, 37 insertions(+), 81 deletions(-) rename src/main/kotlin/{ => org/example}/api/BookerApi.kt (98%) rename src/main/kotlin/{ => org/example}/api/RestfulBookerApi.kt (96%) rename src/main/kotlin/{ => org/example}/model/AuthRequest.kt (75%) rename src/main/kotlin/{ => org/example}/model/AuthResponse.kt (66%) rename src/main/kotlin/{ => org/example}/model/BookingIdResponse.kt (68%) rename src/main/kotlin/{ => org/example}/model/BookingRequest.kt (88%) rename src/main/kotlin/{ => org/example}/model/BookingResponse.kt (88%) rename src/main/kotlin/{ => org/example}/model/Bookingdates.kt (74%) rename src/main/kotlin/{ => org/example}/model/CreateBookingResponse.kt (77%) rename src/main/kotlin/{ => org/example}/model/UpdateBookingRequest.kt (90%) rename src/main/kotlin/{ => org/example}/storage/OrdersDatabase.kt (96%) rename src/test/kotlin/{ => org/example}/NetworkTests.kt (96%) rename src/test/kotlin/{ => org/example}/Tests.kt (82%) rename src/test/kotlin/{ => org/example}/utils/FileReader.kt (95%) delete mode 100644 src/test/resources/reportTemplate.jrxml diff --git a/src/main/kotlin/api/BookerApi.kt b/src/main/kotlin/org/example/api/BookerApi.kt similarity index 98% rename from src/main/kotlin/api/BookerApi.kt rename to src/main/kotlin/org/example/api/BookerApi.kt index 7d468a8..9a9964f 100644 --- a/src/main/kotlin/api/BookerApi.kt +++ b/src/main/kotlin/org/example/api/BookerApi.kt @@ -1,4 +1,4 @@ -package api +package org.example.api import com.google.gson.GsonBuilder import okhttp3.OkHttpClient diff --git a/src/main/kotlin/api/RestfulBookerApi.kt b/src/main/kotlin/org/example/api/RestfulBookerApi.kt similarity index 96% rename from src/main/kotlin/api/RestfulBookerApi.kt rename to src/main/kotlin/org/example/api/RestfulBookerApi.kt index 3eaf812..71a28dc 100644 --- a/src/main/kotlin/api/RestfulBookerApi.kt +++ b/src/main/kotlin/org/example/api/RestfulBookerApi.kt @@ -1,6 +1,6 @@ -package api +package org.example.api -import model.* +import org.example.model.* import retrofit2.Response import retrofit2.http.* diff --git a/src/main/kotlin/model/AuthRequest.kt b/src/main/kotlin/org/example/model/AuthRequest.kt similarity index 75% rename from src/main/kotlin/model/AuthRequest.kt rename to src/main/kotlin/org/example/model/AuthRequest.kt index 0c5aa34..d558254 100644 --- a/src/main/kotlin/model/AuthRequest.kt +++ b/src/main/kotlin/org/example/model/AuthRequest.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class AuthRequest( val username: String, diff --git a/src/main/kotlin/model/AuthResponse.kt b/src/main/kotlin/org/example/model/AuthResponse.kt similarity index 66% rename from src/main/kotlin/model/AuthResponse.kt rename to src/main/kotlin/org/example/model/AuthResponse.kt index d8a5fa5..fa6ab3a 100644 --- a/src/main/kotlin/model/AuthResponse.kt +++ b/src/main/kotlin/org/example/model/AuthResponse.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class AuthResponse ( val token: String diff --git a/src/main/kotlin/model/BookingIdResponse.kt b/src/main/kotlin/org/example/model/BookingIdResponse.kt similarity index 68% rename from src/main/kotlin/model/BookingIdResponse.kt rename to src/main/kotlin/org/example/model/BookingIdResponse.kt index d56937e..c111459 100644 --- a/src/main/kotlin/model/BookingIdResponse.kt +++ b/src/main/kotlin/org/example/model/BookingIdResponse.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class BookingIdResponse( val bookingid: Int diff --git a/src/main/kotlin/model/BookingRequest.kt b/src/main/kotlin/org/example/model/BookingRequest.kt similarity index 88% rename from src/main/kotlin/model/BookingRequest.kt rename to src/main/kotlin/org/example/model/BookingRequest.kt index a721e6c..147116d 100644 --- a/src/main/kotlin/model/BookingRequest.kt +++ b/src/main/kotlin/org/example/model/BookingRequest.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class BookingRequest ( var firstname: String, diff --git a/src/main/kotlin/model/BookingResponse.kt b/src/main/kotlin/org/example/model/BookingResponse.kt similarity index 88% rename from src/main/kotlin/model/BookingResponse.kt rename to src/main/kotlin/org/example/model/BookingResponse.kt index 424ae12..e1b171a 100644 --- a/src/main/kotlin/model/BookingResponse.kt +++ b/src/main/kotlin/org/example/model/BookingResponse.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class BookingResponse( diff --git a/src/main/kotlin/model/Bookingdates.kt b/src/main/kotlin/org/example/model/Bookingdates.kt similarity index 74% rename from src/main/kotlin/model/Bookingdates.kt rename to src/main/kotlin/org/example/model/Bookingdates.kt index efceaea..48dce18 100644 --- a/src/main/kotlin/model/Bookingdates.kt +++ b/src/main/kotlin/org/example/model/Bookingdates.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class Bookingdates ( var checkin: String, diff --git a/src/main/kotlin/model/CreateBookingResponse.kt b/src/main/kotlin/org/example/model/CreateBookingResponse.kt similarity index 77% rename from src/main/kotlin/model/CreateBookingResponse.kt rename to src/main/kotlin/org/example/model/CreateBookingResponse.kt index 3442f28..caa60c0 100644 --- a/src/main/kotlin/model/CreateBookingResponse.kt +++ b/src/main/kotlin/org/example/model/CreateBookingResponse.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class CreateBookingResponse( var bookingid: Int, diff --git a/src/main/kotlin/model/UpdateBookingRequest.kt b/src/main/kotlin/org/example/model/UpdateBookingRequest.kt similarity index 90% rename from src/main/kotlin/model/UpdateBookingRequest.kt rename to src/main/kotlin/org/example/model/UpdateBookingRequest.kt index 092e282..b60ae81 100644 --- a/src/main/kotlin/model/UpdateBookingRequest.kt +++ b/src/main/kotlin/org/example/model/UpdateBookingRequest.kt @@ -1,4 +1,4 @@ -package model +package org.example.model data class UpdateBookingRequest( var firstname: String? = null, diff --git a/src/main/kotlin/storage/OrdersDatabase.kt b/src/main/kotlin/org/example/storage/OrdersDatabase.kt similarity index 96% rename from src/main/kotlin/storage/OrdersDatabase.kt rename to src/main/kotlin/org/example/storage/OrdersDatabase.kt index 8b3ed62..1f6bf97 100644 --- a/src/main/kotlin/storage/OrdersDatabase.kt +++ b/src/main/kotlin/org/example/storage/OrdersDatabase.kt @@ -1,7 +1,7 @@ -package storage +package org.example.storage -import model.BookingResponse -import model.Bookingdates +import org.example.model.BookingResponse +import org.example.model.Bookingdates class OrdersDatabase { private val storage = mutableMapOf() diff --git a/src/main/resources/Log4j2.xml b/src/main/resources/Log4j2.xml index 3957a82..c4c5a64 100644 --- a/src/main/resources/Log4j2.xml +++ b/src/main/resources/Log4j2.xml @@ -1,7 +1,7 @@ - C:\\logs + Classpath - + diff --git a/src/test/kotlin/NetworkTests.kt b/src/test/kotlin/org/example/NetworkTests.kt similarity index 96% rename from src/test/kotlin/NetworkTests.kt rename to src/test/kotlin/org/example/NetworkTests.kt index 8f35e0e..59383ec 100644 --- a/src/test/kotlin/NetworkTests.kt +++ b/src/test/kotlin/org/example/NetworkTests.kt @@ -1,3 +1,5 @@ +package org.example + import kotlinx.coroutines.runBlocking import retrofit2.Response import java.io.IOException diff --git a/src/test/kotlin/Tests.kt b/src/test/kotlin/org/example/Tests.kt similarity index 82% rename from src/test/kotlin/Tests.kt rename to src/test/kotlin/org/example/Tests.kt index f32bf84..fc74b64 100644 --- a/src/test/kotlin/Tests.kt +++ b/src/test/kotlin/org/example/Tests.kt @@ -1,22 +1,17 @@ -import api.BookerApi -import api.RestfulBookerApi -import model.AuthRequest -import model.BookingRequest -import model.Bookingdates -import model.UpdateBookingRequest -import net.sf.jasperreports.engine.JasperCompileManager -import net.sf.jasperreports.engine.JasperFillManager -import net.sf.jasperreports.engine.JasperReport -import net.sf.jasperreports.engine.export.HtmlExporter -import net.sf.jasperreports.engine.util.JRSaver -import net.sf.jasperreports.export.SimpleHtmlExporterOutput +package org.example + +import org.example.api.BookerApi +import org.example.api.RestfulBookerApi +import org.example.model.AuthRequest +import org.example.model.BookingRequest +import org.example.model.Bookingdates +import org.example.model.UpdateBookingRequest import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.message.MessageFormatMessage import org.assertj.core.api.AssertionsForClassTypes.assertThat import org.junit.jupiter.api.* -import storage.OrdersDatabase -import utils.FileReader -import java.io.InputStream +import org.example.storage.OrdersDatabase +import org.example.utils.FileReader import java.util.* @@ -26,10 +21,7 @@ class Tests : NetworkTests() { companion object { private lateinit var bookerApi: RestfulBookerApi private val fileReader = FileReader() - private val logger = LogManager.getLogger("Test") - - val bookingsReportStream: InputStream = javaClass.getResourceAsStream("/bookingsReport.jrxml") - val jasperReport: JasperReport = JasperCompileManager.compileReport(bookingsReportStream) + private val logger = LogManager.getLogger(Tests::javaClass) private val storage = OrdersDatabase() @@ -49,8 +41,6 @@ class Tests : NetworkTests() { @JvmStatic internal fun afterAll() { storage.clearAllData() - - JRSaver.saveObject(jasperReport, "bookingReport.jasper"); } } @@ -89,13 +79,13 @@ class Tests : NetworkTests() { /* * Then */ - val bookingIds = responseUnwrap { bookerApi.getBookingIds() } - assertThat(bookingIds.size) + val bookingIdsResponse = responseUnwrap { bookerApi.getBookingIds() } + assertThat(bookingIdsResponse.size) .withFailMessage("Did not find 3 bookings") .isGreaterThanOrEqualTo(3) + val bookingIds = bookingIdsResponse.map { it.bookingid }.joinToString() - JasperFillManager. - logger.trace("Available booking IDs: ${bookingIds.joinToString()}") + logger.info("Available booking IDs: $bookingIds") // Add the booking details and idea for later bookingResponses.forEach { response -> @@ -178,14 +168,14 @@ class Tests : NetworkTests() { /* * Then */ - logger.trace( + logger.info( MessageFormatMessage( "Booking with ID: {0} has been updated to the following: {1}", orderIdTestOne, updateTestOneResponse ) ) - logger.trace( + logger.info( MessageFormatMessage( "Booking with ID: {0} has been updated to the following: {1}", orderIdTestTwo, @@ -215,7 +205,7 @@ class Tests : NetworkTests() { /* * Then */ - logger.trace( + logger.info( MessageFormatMessage( "Booking with ID: {0} has been delete and given the following response: {1}", idOfAny, @@ -238,13 +228,5 @@ class Tests : NetworkTests() { /* * Then */ - val exporter = HtmlExporter() - -// Set input ... - -// Set input ... - exporter.exporterOutput = SimpleHtmlExporterOutput("bookingsReport.html") - - exporter.exportReport() } } \ No newline at end of file diff --git a/src/test/kotlin/utils/FileReader.kt b/src/test/kotlin/org/example/utils/FileReader.kt similarity index 95% rename from src/test/kotlin/utils/FileReader.kt rename to src/test/kotlin/org/example/utils/FileReader.kt index 00ad928..d43e5db 100644 --- a/src/test/kotlin/utils/FileReader.kt +++ b/src/test/kotlin/org/example/utils/FileReader.kt @@ -1,4 +1,4 @@ -package utils +package org.example.utils import com.google.gson.Gson import java.io.BufferedReader diff --git a/src/test/resources/reportTemplate.jrxml b/src/test/resources/reportTemplate.jrxml deleted file mode 100644 index 53be0d7..0000000 --- a/src/test/resources/reportTemplate.jrxml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file