diff --git a/pom.xml b/pom.xml index e6d4e91..649139b 100644 --- a/pom.xml +++ b/pom.xml @@ -81,4 +81,25 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${maven.compiler.source} + ${maven.compiler.target} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + diff --git a/src/main/java/fileio/AirInput.java b/src/main/java/fileio/AirInput.java index dd86478..dd14e83 100644 --- a/src/main/java/fileio/AirInput.java +++ b/src/main/java/fileio/AirInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/main/java/fileio/AnimalInput.java b/src/main/java/fileio/AnimalInput.java index ebf895b..bade253 100644 --- a/src/main/java/fileio/AnimalInput.java +++ b/src/main/java/fileio/AnimalInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/main/java/fileio/CommandInput.java b/src/main/java/fileio/CommandInput.java index bc8429b..18251a1 100644 --- a/src/main/java/fileio/CommandInput.java +++ b/src/main/java/fileio/CommandInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; @Data diff --git a/src/main/java/fileio/PairInput.java b/src/main/java/fileio/PairInput.java index c1053c7..30bcadd 100644 --- a/src/main/java/fileio/PairInput.java +++ b/src/main/java/fileio/PairInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; @Data diff --git a/src/main/java/fileio/PlantInput.java b/src/main/java/fileio/PlantInput.java index 65974f0..fa2f4e6 100644 --- a/src/main/java/fileio/PlantInput.java +++ b/src/main/java/fileio/PlantInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/main/java/fileio/SimulationInput.java b/src/main/java/fileio/SimulationInput.java index a57bc28..1af4144 100644 --- a/src/main/java/fileio/SimulationInput.java +++ b/src/main/java/fileio/SimulationInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; @Data diff --git a/src/main/java/fileio/SoilInput.java b/src/main/java/fileio/SoilInput.java index 06324b9..d498bfa 100644 --- a/src/main/java/fileio/SoilInput.java +++ b/src/main/java/fileio/SoilInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/main/java/fileio/TerritorySectionParamsInput.java b/src/main/java/fileio/TerritorySectionParamsInput.java index 2bd9737..d7383ec 100644 --- a/src/main/java/fileio/TerritorySectionParamsInput.java +++ b/src/main/java/fileio/TerritorySectionParamsInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/main/java/fileio/WaterInput.java b/src/main/java/fileio/WaterInput.java index 116379e..a6889dc 100644 --- a/src/main/java/fileio/WaterInput.java +++ b/src/main/java/fileio/WaterInput.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; diff --git a/src/test/java/DevmindResult.java b/src/test/java/DevmindResult.java index 4ac9afe..e99b091 100644 --- a/src/test/java/DevmindResult.java +++ b/src/test/java/DevmindResult.java @@ -1,3 +1,4 @@ +import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -7,13 +8,13 @@ public class DevmindResult { @JsonProperty private final String test; - @Getter @JsonProperty private final String status; @JsonProperty("test_score") private final int testScore; + public DevmindResult(String test, String status, int testScore) { this.test = test; this.status = status; @@ -29,4 +30,8 @@ public String toString() { return e.getMessage(); } } + + public String getStatus() { + return status; + } } diff --git a/src/test/java/TestCaseWatcher.java b/src/test/java/TestCaseWatcher.java index 363dec1..8da2a5d 100644 --- a/src/test/java/TestCaseWatcher.java +++ b/src/test/java/TestCaseWatcher.java @@ -14,7 +14,7 @@ public record TestCaseData(String testName, String input, String output, String public void testSuccessful(ExtensionContext context) { try { TestCaseData testCaseData = getTestCaseData(context); - stringBuilder.append("CASE - %s - %s/%s = PASSED\n".formatted(testCaseData.testName(), testCaseData.points(), testCaseData.points())); + stringBuilder.append("CASE - %s - %s/%s = PASSED\n".formatted(testCaseData.testName(), testCaseData.points())); totalPoints += testCaseData.points(); } catch (IllegalArgumentException e) { @@ -26,7 +26,7 @@ public void testSuccessful(ExtensionContext context) { public void testFailed(ExtensionContext context, Throwable cause) { try { TestCaseData testCaseData = getTestCaseData(context); - stringBuilder.append("CASE - %s - 0/%s = FAILED\n".formatted(testCaseData.testName(), testCaseData.points())); + stringBuilder.append("CASE - %s - 0/%s = FAILED\n".formatted(testCaseData.testName(), testCaseData.points(), testCaseData.points())); } catch (IllegalArgumentException e) { // Do nothing diff --git a/src/test/java/TestRunner.java b/src/test/java/TestRunner.java index 0990670..3887b21 100644 --- a/src/test/java/TestRunner.java +++ b/src/test/java/TestRunner.java @@ -128,16 +128,15 @@ public void testCheckstyle() throws CheckstyleException, IOException { assertThat(errorCount).isLessThanOrEqualTo(CheckerConstants.MAXIMUM_ERROR_CHECKSTYLE); devmindResults.add(new DevmindResult( "checkstyle", - "", + PASSED, CheckerConstants.CHECKSTYLE_POINTS )); System.out.println(checkStyleErrors); - TestCaseWatcher.totalPoints += CheckerConstants.CHECKSTYLE_POINTS; } catch (AssertionError e) { devmindResults.add(new DevmindErrorResult( "checkstyle", - CheckerConstants.CHECKSTYLE_POINTS, + 10, e.getMessage() )); throw new CheckstyleException(checkStyleErrors); @@ -172,10 +171,9 @@ public void testGitCommits() throws GitAPIException, IOException { devmindResults.add(new DevmindResult( "git", - "", + PASSED, CheckerConstants.GIT_POINTS )); - TestCaseWatcher.totalPoints += CheckerConstants.GIT_POINTS; } catch (IOException | AssertionError | GitAPIException e) { devmindResults.add(new DevmindErrorResult( "git", @@ -207,7 +205,7 @@ private static void printLocalResults() { .allMatch(result -> PASSED.equals(result.getStatus())); if (allPassed) { - System.out.println("Yey, ai reusit sa-l ajuti cu succes pe TerraBot sa descopere planeta \uD83D\uDE0A\\"); + System.out.println("Yey, ai reusit sa-l ajuti cu succes pe TerraBot sa descopere planeta \uD83D\uDE0A\""); System.out.println("Uite un mic gest de recunostinta ❤"); System.out.println("https://youtu.be/coXOFBjLjHI?si=IT1bHEOEs7kHea1m"); }