From 115950bf23ae233def7037685a079f980b0e7d5b Mon Sep 17 00:00:00 2001 From: joethei Date: Thu, 23 May 2019 15:15:30 +0200 Subject: [PATCH] + readme + sonarqube integration + removed unnecessary stuff --- README.md | 28 ++++++++++++++++ pom.xml | 30 +++++++++++++++++ src/main/webapp/header.jsp | 12 ------- src/main/webapp/index.jsp | 33 ++----------------- .../spm/baudas/analysis/WeekOverviewTest.java | 6 ++-- 5 files changed, 64 insertions(+), 45 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..dff7b07 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +![BauDas Logo](https://services.joethei.xyz/images/bauDas.png) +#Kundenkarten Verwaltung + +[![Build Status](https://teamcity.joethei.xyz/app/rest/builds/buildType:(id:Studium_Programmierung_Softwareprojektmanagement_SpmProd)/statusIcon)](https://tcstatus.joethei.space/dashboard/spm) +[![Quality Gate](https://sonarqube.joethei.xyz/api/project_badges/measure?project=Studium_Programmierung_Softwareprojektmanagement&metric=alert_status) +![Code Coverage](https://sonarqube.joethei.xyz/api/project_badges/measure?project=Studium_Programmierung_Softwareprojektmanagement&metric=coverage)](https://sonarqube.joethei.xyz/dashboard?id=Studium_Programmierung_Softwareprojektmanagement) + +## Requirements + +- Java 8 +- Maven 3 +- Tomcat 9 + +## Development Setup + +- clone this repository +- import it into your preferred editor +- start the server with maven goal ````tomcat7:run```` +- change stuff +- restart the server if needed + + +## TODO: better Name for this +- clone this repository +- run maven goal ````package```` +- war can be found in target folder + +© 2019 Ihni GmbH \ No newline at end of file diff --git a/pom.xml b/pom.xml index b498d69..fc47fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,10 @@ 1.8 checkstyle.xml UTF-8 + ${project.build.directory}/jacoco.exec + Johannes Theiner @@ -213,6 +215,34 @@ + + + org.jacoco + jacoco-maven-plugin + 0.8.4 + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp index b1b958e..5cd9784 100644 --- a/src/main/webapp/header.jsp +++ b/src/main/webapp/header.jsp @@ -65,18 +65,6 @@
    • -
  • -
    - -
    - -
    -
  • diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 8d34d83..6879491 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -11,12 +11,9 @@
    - Übersicht -
    -
    - Tagesübersicht - Wochenübersicht + Wochenübersicht
    +
    @@ -52,31 +49,7 @@
    - <%-- -
    -
    -
    -
    - Verkaufte Artikel -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    -
    --%> - - +
    diff --git a/src/test/java/de/hsel/spm/baudas/analysis/WeekOverviewTest.java b/src/test/java/de/hsel/spm/baudas/analysis/WeekOverviewTest.java index 0f6f283..2ed832e 100644 --- a/src/test/java/de/hsel/spm/baudas/analysis/WeekOverviewTest.java +++ b/src/test/java/de/hsel/spm/baudas/analysis/WeekOverviewTest.java @@ -30,7 +30,7 @@ class WeekOverviewTest { AtomicReference>> result = new AtomicReference<>(); - assertTimeout(Duration.ofMillis(1), () -> result.set(overview.getResult())); + assertTimeout(Duration.ofMillis(5), () -> result.set(overview.getResult())); assertEquals(2477, result.get().get("Montag").getKey()); @@ -57,7 +57,7 @@ class WeekOverviewTest { AtomicReference>> result = new AtomicReference<>(); - assertTimeout(Duration.ofMillis(3), () -> result.set(overview.getResult())); + assertTimeout(Duration.ofMillis(7), () -> result.set(overview.getResult())); assertEquals(26273, result.get().get("Montag").getKey()); @@ -84,7 +84,7 @@ class WeekOverviewTest { AtomicReference>> result = new AtomicReference<>(); - assertTimeout(Duration.ofMillis(30), () -> result.set(overview.getResult())); + assertTimeout(Duration.ofMillis(60), () -> result.set(overview.getResult())); assertEquals(295688, result.get().get("Montag").getKey());