nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Make CI more flexible, fixed string comparator, javafx doc

Browse Source
This commit is contained in:
Paul Scott 2023-04-18 09:37:01 +10:00
parent 3c824e830c
commit 10d2a9b3ac
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -9,8 +9,10 @@ stages:
before_script: before_script:
- export PATH_TO_FX=/usr/share/openjfx/lib - export PATH_TO_FX=/usr/share/openjfx/lib
- export JAVAFX_OPTIONS="--module-path $PATH_TO_FX --add-modules javafx.controls,javafx.fxml,javafx.media" - export JAVAFX_OPTIONS="--module-path $PATH_TO_FX --add-modules javafx.controls,javafx.fxml,javafx.media"
- export CP=src:/ass2/*:/shared/junit-platform-console-standalone-1.7.0.jar:$PATH_TO_FX/* - export CP=src:src-dev:/ass2/*:/shared/junit-platform-console-standalone-1.7.0.jar:$PATH_TO_FX/*
- export JUNIT="java $JAVAFX_OPTIONS -jar /shared/junit-platform-console-standalone-1.7.0.jar --class-path src:/ass2/comp1110-ass2.jar --disable-banner" - export JUNIT="java $JAVAFX_OPTIONS -jar /shared/junit-platform-console-standalone-1.7.0.jar --class-path src:src-dev:/ass2/comp1110-ass2.jar --disable-banner"
- export SRC_FILES=$(find src/ -type f -name '*.java')
- export SRC_DEV_FILES=$(if [ -d "src-dev/" ]; then find src-dev/ -type f -name '*.java'; fi)
checksum: checksum:
tags: tags:
@ -38,11 +40,11 @@ build:
- comp1110 - comp1110
stage: build stage: build
script: script:
- javac -encoding utf-8 $JAVAFX_OPTIONS -cp $CP src/comp1110/ass2/*.java src/comp1110/ass2/*/*.java - javac -encoding utf-8 $JAVAFX_OPTIONS -cp $CP $SRC_FILES $SRC_DEV_FILES
artifacts: artifacts:
paths: paths:
- src/comp1110/ass2/*.class - src/
- src/comp1110/ass2/*/*.class - src-dev/
task3: task3:
tags: tags:

10
.idea/libraries/javafx.xml
View File

@ -7,7 +7,15 @@
<NATIVE> <NATIVE>
<root url="file://$PATH_TO_FX$" /> <root url="file://$PATH_TO_FX$" />
</NATIVE> </NATIVE>
<SOURCES /> <SOURCES>
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.base" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.controls" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.fxml" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.graphics" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.media" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.swing" />
<root url="jar://$PATH_TO_FX$/../src.zip!/javafx.web" />
</SOURCES>
<jarDirectory url="file://$PATH_TO_FX$" recursive="false" /> <jarDirectory url="file://$PATH_TO_FX$" recursive="false" />
</library> </library>
</component> </component>

4
tests/comp1110/ass2/stringcomparator/StringComparator.java
View File

@ -133,14 +133,14 @@ public class StringComparator {
private void checkGeneralString(List<String> statementsA, List<String> statementsB, List<String> errors) { private void checkGeneralString(List<String> statementsA, List<String> statementsB, List<String> errors) {
// Check for the number of statements // Check for the number of statements
if (checks.get(ResultType.General).contains("num_statements") && if (checks.get(ResultType.General).contains("numStatements") &&
statementsA.size() != statementsB.size()) statementsA.size() != statementsB.size())
{ {
errors.add("Strings contain different numbers of statements"); errors.add("Strings contain different numbers of statements");
} }
// Check if there are any unrecognised statement IDs // Check if there are any unrecognised statement IDs
if (checks.get(ResultType.General).contains("unrecognised_statements")) if (checks.get(ResultType.General).contains("unrecognisedStatements"))
{ {
List<String> unrecognised = statementsB List<String> unrecognised = statementsB
.stream() .stream()