fix(ci): change imports, add edit build gradle, fix make file, keep files,

Author: michaelbrendo

.gitignore

@@ -38,3 +38,6 @@ out/
 
 ### Kotlin ###
 .kotlin
+
+### allure ###
+allure-history/

build.gradle.kts

@@ -1,6 +1,14 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootWar
 
+val aspectJVersion = "1.9.22"
+val allureVersion = "2.29.1"
+
+val agent: Configuration by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = true
+}
+
 plugins {
 	war
 	id("org.springframework.boot") version "3.3.0"
@@ -14,6 +22,7 @@ plugins {
 group = "com.example"
 version = "0.0.1-SNAPSHOT"
 
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 }
@@ -23,7 +32,9 @@ repositories {
 }
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-web")
+    agent("org.aspectj:aspectjweaver:$aspectJVersion")
+
+    implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	implementation("org.slf4j:slf4j-api:2.0.7")
 	implementation("ch.qos.logback:logback-classic:1.4.7")
@@ -32,19 +43,15 @@ dependencies {
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     testImplementation("io.rest-assured:kotlin-extensions:5.3.0")
 	testImplementation("io.rest-assured:json-schema-validator:5.3.0")
 
-    testImplementation("io.qameta.allure:allure-junit4:2.21.0")
-}
-
-allure {
-    version.set("2.21.0")
+    testImplementation(platform("io.qameta.allure:allure-bom:$allureVersion"))
+    testImplementation("io.qameta.allure:allure-junit4")
+    testImplementation("io.qameta.allure:allure-junit4-aspect")
 }
 
-
 tasks.withType<KotlinCompile> {
 	kotlinOptions {
 		freeCompilerArgs += "-Xjsr305=strict"
@@ -53,10 +60,14 @@ tasks.withType<KotlinCompile> {
 }
 
 tasks.withType<Test> {
-    useJUnitPlatform() // JUnit4
-    testLogging {
-        events("passed", "skipped", "failed")
-    }
+    ignoreFailures = true
+    useJUnit() // JUnit4
+//    testLogging {
+//        events("passed", "skipped", "failed")
+//    }
+//    jvmArgs = listOf(
+//        "-javaagent:${agent.singleFile}"
+//    )
 }
 
 tasks.named<BootWar>("bootWar") {

makefile

@@ -4,6 +4,9 @@ ALLURE_VERSION=2.34.1
 ALLURE_DIR=/opt/allure
 ALLURE_BIN=/usr/bin/allure
 ALLURE_TGZ=/tmp/allure.tgz
+ALLURE_HISTORY_DIR=allure-history
+ALLURE_RESULTS_DIR=build/allure-results
+ALLURE_REPORT_DIR=build/reports/allure-report/allureReport
 
 .PHONY: test allure-report allure-serve install-allure setup
 
@@ -18,7 +21,15 @@ setup: install-allure test allure-report allure-serve
 # Generate Allure report
 allure-report:
 	@echo "📊 Generating Allure report..."
-	./gradlew allureReport
+	# Copy history if exists
+	if [ -d $(ALLURE_HISTORY_DIR) ]; then \
+		mkdir -p $(ALLURE_RESULTS_DIR)/history; \
+		sudo cp -r $(ALLURE_HISTORY_DIR)/* $(ALLURE_RESULTS_DIR)/history/; \
+	fi
+	./gradlew allureReport --clean
+	# Save history for next run
+	mkdir -p $(ALLURE_HISTORY_DIR)
+	sudo cp -r $(ALLURE_REPORT_DIR)/history/* $(ALLURE_HISTORY_DIR)/ || true
 
 # Serve Allure report
 allure-serve:

src/test/kotlin/tests/PlaceholderTest.kt

@@ -1,11 +1,11 @@
 package tests
 
 import io.qameta.allure.*
+import io.qameta.allure.junit4.Tag
 import io.restassured.internal.RestAssuredResponseImpl
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.Test
+import org.junit.Assert.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Tag
-import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.HttpStatus.CREATED
 import org.springframework.http.HttpStatus.OK
@@ -17,12 +17,12 @@ import util.enums.schemas.PlaceHolderSchemas
 @SpringBootTest(classes = [Any::class])
 class PlaceholderTest {
 
+    @Test
     @Epic("Place holder API")
     @Feature("Post /posts")
     @Story("Should create posts")
     @Severity(SeverityLevel.CRITICAL)
     @Tag("sanity")
-    @Test
     fun `Should create post`() {
         val payload = PostPayload("foo", "bar", 1)
         val response = PlaceholderService().createPost(payload, PlaceHolderSchemas.POST_CREATE_POST.schema) as RestAssuredResponseImpl
@@ -89,4 +89,12 @@ class PlaceholderTest {
         assertEquals(OK.value(), response.statusCode)
         helper.validateComments(firstComment, 1)
     }
+
+//    @Severity(SeverityLevel.CRITICAL)
+//    @Tag("smokeTest")
+//    @Test
+//    fun `should fail`() {
+//        assertTrue(false)
+//    }
+
 }

src/test/resources/allure.properties

@@ -0,0 +1 @@
+allure.results.directory=build/allure-results