Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,25 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>

</project>
1 change: 1 addition & 0 deletions src/main/java/fileio/AirInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/AnimalInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/CommandInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Data
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/PairInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Data
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/PlantInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/SimulationInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Data
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/SoilInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/TerritorySectionParamsInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fileio/WaterInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/DevmindResult.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -29,4 +30,8 @@ public String toString() {
return e.getMessage();
}
}

public String getStatus() {
return status;
}
}
4 changes: 2 additions & 2 deletions src/test/java/TestCaseWatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions src/test/java/TestRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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");
}
Expand Down