BlueGit

timfa containerpipes

Merge branch 'feature/auto-release-tests'

timfa Grok Bot · pushed by timfa

Authored 2026-11-17 · 8 hours ago

Hash
4a5c1064420ef3263e20e4167cd79967709c56b9
Pipeline
Passed
8 files changed +167 −31
.gitlab-ci.yml +9 −0
@@ -1,3 +1,4 @@
1 # GitLab-backup: test draait eerst; daarna de bestaande tag-release.
1 2 # Release pipeline: runs when a version tag is created (e.g. v1.8.0 or 1.8.0).
2 3 #
3 4 # Required CI/CD variable:
@@ -22,12 +23,19 @@ variables:
22 23 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
23 24
24 25 stages:
26 - test
25 27 - validate
26 28 - bump
27 29 - build
28 30 - release
29 31 - rotate
30 32
33 test:
34 stage: test
35 image: gradle:jdk25
36 script:
37 - gradle --no-daemon test
38
31 39 .validate_image:
32 40 image: alpine:3.20
33 41 before_script:
@@ -38,6 +46,7 @@ stages:
38 46 validate:version:
39 47 extends: .validate_image
40 48 stage: validate
49 needs: [test]
41 50 script:
42 51 - ./scripts/release.sh validate
43 52 artifacts:
@@ -1,3 +1,4 @@
1# GitLab-backup: test draait eerst; daarna de bestaande tag-release.
1# Release pipeline: runs when a version tag is created (e.g. v1.8.0 or 1.8.0).
2# Release pipeline: runs when a version tag is created (e.g. v1.8.0 or 1.8.0).
2#
3#
3# Required CI/CD variable:
4# Required CI/CD variable:
@@ -22,12 +23,19 @@ variables:
22 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
23 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
23
24
24stages:
25stages:
26 - test
25 - validate
27 - validate
26 - bump
28 - bump
27 - build
29 - build
28 - release
30 - release
29 - rotate
31 - rotate
30
32
33test:
34 stage: test
35 image: gradle:jdk25
36 script:
37 - gradle --no-daemon test
38
31.validate_image:
39.validate_image:
32 image: alpine:3.20
40 image: alpine:3.20
33 before_script:
41 before_script:
@@ -38,6 +46,7 @@ stages:
38validate:version:
46validate:version:
39 extends: .validate_image
47 extends: .validate_image
40 stage: validate
48 stage: validate
49 needs: [test]
41 script:
50 script:
42 - ./scripts/release.sh validate
51 - ./scripts/release.sh validate
43 artifacts:
52 artifacts:
blue-ci-cd.yml +18 −14
@@ -1,29 +1,34 @@
1 # BlueGit CI (vertaald uit .gitlab-ci.yml; GitLab is alleen nog backup).
1 # BlueGit CI.
2 2 #
3 # Op GitLab startte een nieuwe tag de release (validate, bump-commit terug naar
4 # master met CI_PUSH_TOKEN, build, GitLab-release, token roteren). Op BlueGit
5 # maakt de release-API de tag zelf, dus:
6 # master-push: build (versie = hoogste tag + 1 patch, of RELEASE_VERSION).
7 # release: HANDMATIG, maakt tag + release met de jar. Nooit automatisch,
8 # nooit dubbel. Geen bump-commit; CI_PUSH_TOKEN is niet meer nodig.
9 # Tag-pushes starten geen pipeline. Scripts draaien expliciet met bash.
3 # master-push: test + build (geen release-job, zodat de pipeline op success
4 # eindigt in plaats van manual).
5 # tag-push: test + build, daarna automatisch release (geen manual-stap).
6 # De release-API voor bestaande tags maakt de tag niet aan of verplaatst die
7 # niet; de assets komen uit dezelfde pipeline. Een leidende v op de tag wordt
8 # in de versie en bestandsnaam gestript.
10 9
11 10 workflow:
12 11 rules:
13 12 - if: $CI_COMMIT_TAG != ""
14 when: never
15 - if: $CI_COMMIT_BRANCH == "master"
13 - if: $CI_COMMIT_BRANCH != ""
16 14 - if: $CI_PIPELINE_SOURCE == "web"
17 15 - if: $CI_PIPELINE_SOURCE == "api"
18 16
19 17 variables:
20 18 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
21 19
22 stages: [build, release]
20 stages: [test, build, release]
21
22 test:
23 stage: test
24 image: gradle:jdk25
25 script:
26 - gradle --no-daemon test
23 27
24 28 build:jar:
25 29 stage: build
26 30 image: gradle:jdk25
31 needs: [test]
27 32 script:
28 33 - bash scripts/ci/build.sh
29 34 artifacts:
@@ -33,10 +38,9 @@ build:jar:
33 38 release:
34 39 stage: release
35 40 image: bluegit/base
36 needs: [build:jar]
41 needs: [test, build:jar]
37 42 resource_group: release
38 43 rules:
39 - if: $CI_COMMIT_BRANCH == "master"
40 when: manual
44 - if: $CI_COMMIT_TAG != ""
41 45 script:
42 46 - bash scripts/ci/bluegit-release.sh
@@ -1,29 +1,34 @@
1# BlueGit CI (vertaald uit .gitlab-ci.yml; GitLab is alleen nog backup).
1# BlueGit CI.
2#
2#
3# Op GitLab startte een nieuwe tag de release (validate, bump-commit terug naar
3# master-push: test + build (geen release-job, zodat de pipeline op success
4# master met CI_PUSH_TOKEN, build, GitLab-release, token roteren). Op BlueGit
4# eindigt in plaats van manual).
5# maakt de release-API de tag zelf, dus:
5# tag-push: test + build, daarna automatisch release (geen manual-stap).
6# master-push: build (versie = hoogste tag + 1 patch, of RELEASE_VERSION).
6# De release-API voor bestaande tags maakt de tag niet aan of verplaatst die
7# release: HANDMATIG, maakt tag + release met de jar. Nooit automatisch,
7# niet; de assets komen uit dezelfde pipeline. Een leidende v op de tag wordt
8# nooit dubbel. Geen bump-commit; CI_PUSH_TOKEN is niet meer nodig.
8# in de versie en bestandsnaam gestript.
9# Tag-pushes starten geen pipeline. Scripts draaien expliciet met bash.
10
9
11workflow:
10workflow:
12 rules:
11 rules:
13 - if: $CI_COMMIT_TAG != ""
12 - if: $CI_COMMIT_TAG != ""
14 when: never
13 - if: $CI_COMMIT_BRANCH != ""
15 - if: $CI_COMMIT_BRANCH == "master"
16 - if: $CI_PIPELINE_SOURCE == "web"
14 - if: $CI_PIPELINE_SOURCE == "web"
17 - if: $CI_PIPELINE_SOURCE == "api"
15 - if: $CI_PIPELINE_SOURCE == "api"
18
16
19variables:
17variables:
20 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
18 GRADLE_OPTS: "-Dorg.gradle.daemon=false"
21
19
22stages: [build, release]
20stages: [test, build, release]
21
22test:
23 stage: test
24 image: gradle:jdk25
25 script:
26 - gradle --no-daemon test
23
27
24build:jar:
28build:jar:
25 stage: build
29 stage: build
26 image: gradle:jdk25
30 image: gradle:jdk25
31 needs: [test]
27 script:
32 script:
28 - bash scripts/ci/build.sh
33 - bash scripts/ci/build.sh
29 artifacts:
34 artifacts:
@@ -33,10 +38,9 @@ build:jar:
33release:
38release:
34 stage: release
39 stage: release
35 image: bluegit/base
40 image: bluegit/base
36 needs: [build:jar]
41 needs: [test, build:jar]
37 resource_group: release
42 resource_group: release
38 rules:
43 rules:
39 - if: $CI_COMMIT_BRANCH == "master"
44 - if: $CI_COMMIT_TAG != ""
40 when: manual
41 script:
45 script:
42 - bash scripts/ci/bluegit-release.sh
46 - bash scripts/ci/bluegit-release.sh
build.gradle.kts +11 −0
@@ -7,6 +7,7 @@ group = "nl.timfalken"
7 7 version = "1.8.4"
8 8
9 9 repositories {
10 mavenCentral()
10 11 maven {
11 12 name = "papermc"
12 13 url = uri("https://repo.papermc.io/repository/maven-public/")
@@ -22,6 +23,12 @@ dependencies {
22 23 implementation("com.github.retrooper:packetevents-spigot:2.13.0") {
23 24 exclude(group = "net.kyori")
24 25 }
26 testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
27 testImplementation("org.yaml:snakeyaml:2.4")
28 testRuntimeOnly("org.junit.platform:junit-platform-launcher")
29
30 testImplementation("io.papermc.paper:paper-api:26.2.build.+")
31
25 32 }
26 33
27 34 java {
@@ -45,3 +52,7 @@ tasks.named<Jar>("jar") {
45 52 tasks.named("build") {
46 53 dependsOn(tasks.shadowJar)
47 54 }
55
56 tasks.test {
57 useJUnitPlatform()
58 }
@@ -7,6 +7,7 @@ group = "nl.timfalken"
7version = "1.8.4"
7version = "1.8.4"
8
8
9repositories {
9repositories {
10 mavenCentral()
10 maven {
11 maven {
11 name = "papermc"
12 name = "papermc"
12 url = uri("https://repo.papermc.io/repository/maven-public/")
13 url = uri("https://repo.papermc.io/repository/maven-public/")
@@ -22,6 +23,12 @@ dependencies {
22 implementation("com.github.retrooper:packetevents-spigot:2.13.0") {
23 implementation("com.github.retrooper:packetevents-spigot:2.13.0") {
23 exclude(group = "net.kyori")
24 exclude(group = "net.kyori")
24 }
25 }
26 testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
27 testImplementation("org.yaml:snakeyaml:2.4")
28 testRuntimeOnly("org.junit.platform:junit-platform-launcher")
29
30 testImplementation("io.papermc.paper:paper-api:26.2.build.+")
31
25}
32}
26
33
27java {
34java {
@@ -45,3 +52,7 @@ tasks.named<Jar>("jar") {
45tasks.named("build") {
52tasks.named("build") {
46 dependsOn(tasks.shadowJar)
53 dependsOn(tasks.shadowJar)
47}
54}
55
56tasks.test {
57 useJUnitPlatform()
58}
scripts/ci/bluegit-release.sh +19 −10
@@ -1,15 +1,24 @@
1 1 #!/usr/bin/env bash
2 # BlueGit: release maken met de jar als assets.
3 # De release-API maakt de tag zelf aan en weigert een bestaande tag, dus een
4 # release kan nooit twee keer ontstaan. Overslaan als HEAD al een tag heeft.
2 # BlueGit: publicatie van een bestaande tag (de tag is al gepusht).
3 # POST .../releases/$TAG/assets maakt de release met de build-assets en
4 # wijzigt de tag niet. Alleen job-token, alleen in de tag-pipeline.
5 5 set -euo pipefail
6 : "${CI_API_URL:?}" "${CI_JOB_TOKEN:?}" "${CI_COMMIT_SHA:?}" "${CI_PROJECT_PATH:?}"
7 v="$(cat build/version.txt)"
8 git fetch -q --tags origin 2>/dev/null || true
9 if [[ -n "$(git tag --points-at HEAD)" ]]; then echo "Geen release: HEAD heeft al een tag."; exit 0; fi
10 if git rev-parse -q --verify "refs/tags/$v" >/dev/null; then echo "Tag $v bestaat al" >&2; exit 1; fi
11 body="$(printf '{"tag":"%s","commit":"%s","name":"ContainerPipes %s","body":"Release %s of ContainerPipes.","assets":[{"job":"build:jar","path":"build/out/ContainerPipes.jar","name":"ContainerPipes-%s.jar"}]}' "$v" "$CI_COMMIT_SHA" "$v" "$v" "$v")"
6 : "${CI_API_URL:?}" "${CI_JOB_TOKEN:?}" "${CI_COMMIT_SHA:?}" "${CI_PROJECT_PATH:?}" "${CI_COMMIT_TAG:?}"
7 v="${CI_COMMIT_TAG#v}"
8 [[ -f "build/out/ContainerPipes.jar" ]] || { echo "ontbreekt: build/out/ContainerPipes.jar" >&2; ls -la build/out >&2 || true; exit 1; }
9
10 body="$(python3 -c 'import json,sys; print(json.dumps({
11 "commit": sys.argv[1],
12 "name": "ContainerPipes "+sys.argv[2],
13 "body": "Release "+sys.argv[2]+" of ContainerPipes.",
14 "assets": [{"job": "build:jar", "path": sys.argv[3], "name": sys.argv[4]}],
15 }))' "$CI_COMMIT_SHA" "$v" "build/out/ContainerPipes.jar" "ContainerPipes-${v}.jar")"
16
12 17 resp="$(mktemp)"
13 code="$(curl -sS -o "$resp" -w '%{http_code}' -X POST "$CI_API_URL/repos/$CI_PROJECT_PATH/releases" -H "Authorization: Bearer $CI_JOB_TOKEN" -H "Content-Type: application/json" -d "$body")" || code=000
18 code="$(curl -sS -o "$resp" -w '%{http_code}' -X POST \
19 "$CI_API_URL/repos/$CI_PROJECT_PATH/releases/${CI_COMMIT_TAG}/assets" \
20 -H "Authorization: Bearer $CI_JOB_TOKEN" \
21 -H "Content-Type: application/json" \
22 --data-binary "$body")" || code=000
14 23 cat "$resp"; echo
15 24 [[ "$code" == 2* ]] || { echo "Release-API gaf HTTP $code" >&2; exit 1; }
@@ -1,15 +1,24 @@
1#!/usr/bin/env bash
1#!/usr/bin/env bash
2# BlueGit: release maken met de jar als assets.
2# BlueGit: publicatie van een bestaande tag (de tag is al gepusht).
3# De release-API maakt de tag zelf aan en weigert een bestaande tag, dus een
3# POST .../releases/$TAG/assets maakt de release met de build-assets en
4# release kan nooit twee keer ontstaan. Overslaan als HEAD al een tag heeft.
4# wijzigt de tag niet. Alleen job-token, alleen in de tag-pipeline.
5set -euo pipefail
5set -euo pipefail
6: "${CI_API_URL:?}" "${CI_JOB_TOKEN:?}" "${CI_COMMIT_SHA:?}" "${CI_PROJECT_PATH:?}"
6: "${CI_API_URL:?}" "${CI_JOB_TOKEN:?}" "${CI_COMMIT_SHA:?}" "${CI_PROJECT_PATH:?}" "${CI_COMMIT_TAG:?}"
7v="$(cat build/version.txt)"
7v="${CI_COMMIT_TAG#v}"
8git fetch -q --tags origin 2>/dev/null || true
8[[ -f "build/out/ContainerPipes.jar" ]] || { echo "ontbreekt: build/out/ContainerPipes.jar" >&2; ls -la build/out >&2 || true; exit 1; }
9if [[ -n "$(git tag --points-at HEAD)" ]]; then echo "Geen release: HEAD heeft al een tag."; exit 0; fi
9
10if git rev-parse -q --verify "refs/tags/$v" >/dev/null; then echo "Tag $v bestaat al" >&2; exit 1; fi
10body="$(python3 -c 'import json,sys; print(json.dumps({
11body="$(printf '{"tag":"%s","commit":"%s","name":"ContainerPipes %s","body":"Release %s of ContainerPipes.","assets":[{"job":"build:jar","path":"build/out/ContainerPipes.jar","name":"ContainerPipes-%s.jar"}]}' "$v" "$CI_COMMIT_SHA" "$v" "$v" "$v")"
11 "commit": sys.argv[1],
12 "name": "ContainerPipes "+sys.argv[2],
13 "body": "Release "+sys.argv[2]+" of ContainerPipes.",
14 "assets": [{"job": "build:jar", "path": sys.argv[3], "name": sys.argv[4]}],
15}))' "$CI_COMMIT_SHA" "$v" "build/out/ContainerPipes.jar" "ContainerPipes-${v}.jar")"
16
12resp="$(mktemp)"
17resp="$(mktemp)"
13code="$(curl -sS -o "$resp" -w '%{http_code}' -X POST "$CI_API_URL/repos/$CI_PROJECT_PATH/releases" -H "Authorization: Bearer $CI_JOB_TOKEN" -H "Content-Type: application/json" -d "$body")" || code=000
18code="$(curl -sS -o "$resp" -w '%{http_code}' -X POST \
19 "$CI_API_URL/repos/$CI_PROJECT_PATH/releases/${CI_COMMIT_TAG}/assets" \
20 -H "Authorization: Bearer $CI_JOB_TOKEN" \
21 -H "Content-Type: application/json" \
22 --data-binary "$body")" || code=000
14cat "$resp"; echo
23cat "$resp"; echo
15[[ "$code" == 2* ]] || { echo "Release-API gaf HTTP $code" >&2; exit 1; }
24[[ "$code" == 2* ]] || { echo "Release-API gaf HTTP $code" >&2; exit 1; }
scripts/ci/build.sh +4 −2
@@ -1,8 +1,10 @@
1 1 #!/usr/bin/env bash
2 # Versie bepalen (hoogste tag + 1 patch of RELEASE_VERSION), zelfde bump als
2 # Versie bepalen (tag, RELEASE_VERSION, of hoogste tag + 1 patch), zelfde bump als
3 3 # scripts/release.sh (alleen lokaal in de build, geen commit), jar bouwen.
4 4 set -euo pipefail
5 if [ -n "${RELEASE_VERSION:-}" ]; then v="${RELEASE_VERSION#v}"; else
5 if [ -n "${RELEASE_VERSION:-}" ]; then v="${RELEASE_VERSION#v}"
6 elif [ -n "${CI_COMMIT_TAG:-}" ]; then v="${CI_COMMIT_TAG#v}"
7 else
6 8 last="$(git tag -l | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' | sort -V | tail -n1 || true)"
7 9 IFS=. read -r a b c <<<"${last:-0.0.0}"; v="$a.$b.$((c+1))"
8 10 fi
@@ -1,8 +1,10 @@
1#!/usr/bin/env bash
1#!/usr/bin/env bash
2# Versie bepalen (hoogste tag + 1 patch of RELEASE_VERSION), zelfde bump als
2# Versie bepalen (tag, RELEASE_VERSION, of hoogste tag + 1 patch), zelfde bump als
3# scripts/release.sh (alleen lokaal in de build, geen commit), jar bouwen.
3# scripts/release.sh (alleen lokaal in de build, geen commit), jar bouwen.
4set -euo pipefail
4set -euo pipefail
5if [ -n "${RELEASE_VERSION:-}" ]; then v="${RELEASE_VERSION#v}"; else
5if [ -n "${RELEASE_VERSION:-}" ]; then v="${RELEASE_VERSION#v}"
6elif [ -n "${CI_COMMIT_TAG:-}" ]; then v="${CI_COMMIT_TAG#v}"
7else
6 last="$(git tag -l | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' | sort -V | tail -n1 || true)"
8 last="$(git tag -l | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' | sort -V | tail -n1 || true)"
7 IFS=. read -r a b c <<<"${last:-0.0.0}"; v="$a.$b.$((c+1))"
9 IFS=. read -r a b c <<<"${last:-0.0.0}"; v="$a.$b.$((c+1))"
8fi
10fi
src/main/java/nl/timfalken/containerpipes/AdvancedEndpointsPatch.java +5 −5
@@ -733,7 +733,7 @@ public final class AdvancedEndpointsPatch {
733 733 * All vanilla cauldron block types at a position are the same liquid endpoint.
734 734 * Empty ↔ water/lava/powder-snow swaps must not invalidate an existing pipe.
735 735 */
736 private static boolean isCauldronMaterial(String name) {
736 static boolean isCauldronMaterial(String name) {
737 737 return "CAULDRON".equals(name) || "WATER_CAULDRON".equals(name)
738 738 || "LAVA_CAULDRON".equals(name) || "POWDER_SNOW_CAULDRON".equals(name);
739 739 }
@@ -824,10 +824,10 @@ public final class AdvancedEndpointsPatch {
824 824 return out;
825 825 }
826 826
827 private static long pack(int x,int y,int z){return((long)(x&0x3FFFFFF)<<38)|((long)(z&0x3FFFFFF)<<12)|(y&0xFFFL);}
828 private static int unpackX(long p){int x=(int)(p>>38);return x>=0x2000000?x-0x4000000:x;}
829 private static int unpackY(long p){int y=(int)(p&0xFFF);return y>=0x800?y-0x1000:y;}
830 private static int unpackZ(long p){int z=(int)((p>>12)&0x3FFFFFF);return z>=0x2000000?z-0x4000000:z;}
827 static long pack(int x,int y,int z){return((long)(x&0x3FFFFFF)<<38)|((long)(z&0x3FFFFFF)<<12)|(y&0xFFFL);}
828 static int unpackX(long p){int x=(int)(p>>38);return x>=0x2000000?x-0x4000000:x;}
829 static int unpackY(long p){int y=(int)(p&0xFFF);return y>=0x800?y-0x1000:y;}
830 static int unpackZ(long p){int z=(int)((p>>12)&0x3FFFFFF);return z>=0x2000000?z-0x4000000:z;}
831 831
832 832 private static void log(Object plugin,String message,Throwable t){
833 833 try{Object logger=call(plugin,"getLogger");call(logger,"warning",new Class<?>[]{String.class},message+": "+t);}catch(Throwable ignored){}
@@ -733,7 +733,7 @@ public final class AdvancedEndpointsPatch {
733 * All vanilla cauldron block types at a position are the same liquid endpoint.
733 * All vanilla cauldron block types at a position are the same liquid endpoint.
734 * Empty ↔ water/lava/powder-snow swaps must not invalidate an existing pipe.
734 * Empty ↔ water/lava/powder-snow swaps must not invalidate an existing pipe.
735 */
735 */
736 private static boolean isCauldronMaterial(String name) {
736 static boolean isCauldronMaterial(String name) {
737 return "CAULDRON".equals(name) || "WATER_CAULDRON".equals(name)
737 return "CAULDRON".equals(name) || "WATER_CAULDRON".equals(name)
738 || "LAVA_CAULDRON".equals(name) || "POWDER_SNOW_CAULDRON".equals(name);
738 || "LAVA_CAULDRON".equals(name) || "POWDER_SNOW_CAULDRON".equals(name);
739 }
739 }
@@ -824,10 +824,10 @@ public final class AdvancedEndpointsPatch {
824 return out;
824 return out;
825 }
825 }
826
826
827 private static long pack(int x,int y,int z){return((long)(x&0x3FFFFFF)<<38)|((long)(z&0x3FFFFFF)<<12)|(y&0xFFFL);}
827 static long pack(int x,int y,int z){return((long)(x&0x3FFFFFF)<<38)|((long)(z&0x3FFFFFF)<<12)|(y&0xFFFL);}
828 private static int unpackX(long p){int x=(int)(p>>38);return x>=0x2000000?x-0x4000000:x;}
828 static int unpackX(long p){int x=(int)(p>>38);return x>=0x2000000?x-0x4000000:x;}
829 private static int unpackY(long p){int y=(int)(p&0xFFF);return y>=0x800?y-0x1000:y;}
829 static int unpackY(long p){int y=(int)(p&0xFFF);return y>=0x800?y-0x1000:y;}
830 private static int unpackZ(long p){int z=(int)((p>>12)&0x3FFFFFF);return z>=0x2000000?z-0x4000000:z;}
830 static int unpackZ(long p){int z=(int)((p>>12)&0x3FFFFFF);return z>=0x2000000?z-0x4000000:z;}
831
831
832 private static void log(Object plugin,String message,Throwable t){
832 private static void log(Object plugin,String message,Throwable t){
833 try{Object logger=call(plugin,"getLogger");call(logger,"warning",new Class<?>[]{String.class},message+": "+t);}catch(Throwable ignored){}
833 try{Object logger=call(plugin,"getLogger");call(logger,"warning",new Class<?>[]{String.class},message+": "+t);}catch(Throwable ignored){}
src/test/java/nl/timfalken/containerpipes/EndpointPackTest.java added +31 −0
@@ -0,0 +1,31 @@
1 package nl.timfalken.containerpipes;
2
3 import org.junit.jupiter.api.Test;
4 import org.junit.jupiter.params.ParameterizedTest;
5 import org.junit.jupiter.params.provider.CsvSource;
6
7 import static org.junit.jupiter.api.Assertions.assertEquals;
8
9 class EndpointPackTest {
10
11 @Test
12 void packRoundTripKeepsBlockCoordinates() {
13 long packed = AdvancedEndpointsPatch.pack(100, -20, 200000);
14 assertEquals(100, AdvancedEndpointsPatch.unpackX(packed));
15 assertEquals(-20, AdvancedEndpointsPatch.unpackY(packed));
16 assertEquals(200000, AdvancedEndpointsPatch.unpackZ(packed));
17 }
18
19 @ParameterizedTest
20 @CsvSource({
21 "CAULDRON,true",
22 "WATER_CAULDRON,true",
23 "LAVA_CAULDRON,true",
24 "POWDER_SNOW_CAULDRON,true",
25 "CHEST,false",
26 "cauldron,false"
27 })
28 void cauldronMaterialsAreRecognisedExactly(String name, boolean expected) {
29 assertEquals(expected, AdvancedEndpointsPatch.isCauldronMaterial(name));
30 }
31 }
@@ -0,0 +1,31 @@
1package nl.timfalken.containerpipes;
2
3import org.junit.jupiter.api.Test;
4import org.junit.jupiter.params.ParameterizedTest;
5import org.junit.jupiter.params.provider.CsvSource;
6
7import static org.junit.jupiter.api.Assertions.assertEquals;
8
9class EndpointPackTest {
10
11 @Test
12 void packRoundTripKeepsBlockCoordinates() {
13 long packed = AdvancedEndpointsPatch.pack(100, -20, 200000);
14 assertEquals(100, AdvancedEndpointsPatch.unpackX(packed));
15 assertEquals(-20, AdvancedEndpointsPatch.unpackY(packed));
16 assertEquals(200000, AdvancedEndpointsPatch.unpackZ(packed));
17 }
18
19 @ParameterizedTest
20 @CsvSource({
21 "CAULDRON,true",
22 "WATER_CAULDRON,true",
23 "LAVA_CAULDRON,true",
24 "POWDER_SNOW_CAULDRON,true",
25 "CHEST,false",
26 "cauldron,false"
27 })
28 void cauldronMaterialsAreRecognisedExactly(String name, boolean expected) {
29 assertEquals(expected, AdvancedEndpointsPatch.isCauldronMaterial(name));
30 }
31}
src/test/java/nl/timfalken/containerpipes/PluginConfigTest.java added +70 −0
@@ -0,0 +1,70 @@
1 package nl.timfalken.containerpipes;
2
3 import java.io.IOException;
4 import java.io.InputStream;
5 import java.nio.charset.StandardCharsets;
6 import java.nio.file.Files;
7 import java.nio.file.Path;
8 import java.util.Map;
9 import java.util.Set;
10
11 import org.junit.jupiter.api.Test;
12 import org.yaml.snakeyaml.Yaml;
13
14 import static org.junit.jupiter.api.Assertions.assertEquals;
15 import static org.junit.jupiter.api.Assertions.assertNotNull;
16 import static org.junit.jupiter.api.Assertions.assertTrue;
17
18 class PluginConfigTest {
19
20 @Test
21 @SuppressWarnings("unchecked")
22 void pluginYmlDeclaresAdminCommandAndPermissions() throws IOException {
23 Map<String, Object> yaml = loadYaml("plugin.yml");
24 assertEquals("ContainerPipes", yaml.get("name"));
25 assertEquals("nl.timfalken.containerpipes.ContainerPipesPlugin", yaml.get("main"));
26 assertEquals("26.2", String.valueOf(yaml.get("api-version")));
27 assertEquals(gradleVersion(), String.valueOf(yaml.get("version")));
28
29 Map<String, Object> commands = (Map<String, Object>) yaml.get("commands");
30 assertEquals(Set.of("containerpipes"), commands.keySet());
31 assertEquals("containerpipes.admin", ((Map<String, Object>) commands.get("containerpipes")).get("permission"));
32
33 Map<String, Object> permissions = (Map<String, Object>) yaml.get("permissions");
34 assertEquals(true, ((Map<String, Object>) permissions.get("containerpipes.use")).get("default"));
35 assertEquals("op", ((Map<String, Object>) permissions.get("containerpipes.admin")).get("default"));
36 }
37
38 @Test
39 @SuppressWarnings("unchecked")
40 void configYmlHasTransferDefaultsAndBothLanguages() throws IOException {
41 Map<String, Object> yaml = loadYaml("config.yml");
42 assertEquals(3, ((Number) yaml.get("transfer-interval-ticks")).intValue());
43 assertEquals(32, ((Number) yaml.get("maximum-connection-range")).intValue());
44 assertEquals("minecraft:iron_ingot", yaml.get("pipe-cost-item"));
45
46 Map<String, Object> messages = (Map<String, Object>) yaml.get("messages");
47 Set<String> keys = Set.of("connected", "disconnected", "too-far", "no-route", "invalid-container");
48 assertTrue(((Map<String, Object>) messages.get("nl")).keySet().containsAll(keys));
49 assertTrue(((Map<String, Object>) messages.get("en")).keySet().containsAll(keys));
50 }
51
52 private static Map<String, Object> loadYaml(String name) throws IOException {
53 try (InputStream in = PluginConfigTest.class.getClassLoader().getResourceAsStream(name)) {
54 assertNotNull(in, name);
55 return new Yaml().load(in);
56 }
57 }
58
59 private static String gradleVersion() throws IOException {
60 Path gradle = Path.of("build.gradle.kts");
61 if (!Files.isRegularFile(gradle)) gradle = Path.of("..", "build.gradle.kts");
62 for (String line : Files.readAllLines(gradle, StandardCharsets.UTF_8)) {
63 line = line.trim();
64 if (line.startsWith("version = \"")) {
65 return line.substring("version = \"".length(), line.length() - 1);
66 }
67 }
68 throw new IOException("version not found");
69 }
70 }
@@ -0,0 +1,70 @@
1package nl.timfalken.containerpipes;
2
3import java.io.IOException;
4import java.io.InputStream;
5import java.nio.charset.StandardCharsets;
6import java.nio.file.Files;
7import java.nio.file.Path;
8import java.util.Map;
9import java.util.Set;
10
11import org.junit.jupiter.api.Test;
12import org.yaml.snakeyaml.Yaml;
13
14import static org.junit.jupiter.api.Assertions.assertEquals;
15import static org.junit.jupiter.api.Assertions.assertNotNull;
16import static org.junit.jupiter.api.Assertions.assertTrue;
17
18class PluginConfigTest {
19
20 @Test
21 @SuppressWarnings("unchecked")
22 void pluginYmlDeclaresAdminCommandAndPermissions() throws IOException {
23 Map<String, Object> yaml = loadYaml("plugin.yml");
24 assertEquals("ContainerPipes", yaml.get("name"));
25 assertEquals("nl.timfalken.containerpipes.ContainerPipesPlugin", yaml.get("main"));
26 assertEquals("26.2", String.valueOf(yaml.get("api-version")));
27 assertEquals(gradleVersion(), String.valueOf(yaml.get("version")));
28
29 Map<String, Object> commands = (Map<String, Object>) yaml.get("commands");
30 assertEquals(Set.of("containerpipes"), commands.keySet());
31 assertEquals("containerpipes.admin", ((Map<String, Object>) commands.get("containerpipes")).get("permission"));
32
33 Map<String, Object> permissions = (Map<String, Object>) yaml.get("permissions");
34 assertEquals(true, ((Map<String, Object>) permissions.get("containerpipes.use")).get("default"));
35 assertEquals("op", ((Map<String, Object>) permissions.get("containerpipes.admin")).get("default"));
36 }
37
38 @Test
39 @SuppressWarnings("unchecked")
40 void configYmlHasTransferDefaultsAndBothLanguages() throws IOException {
41 Map<String, Object> yaml = loadYaml("config.yml");
42 assertEquals(3, ((Number) yaml.get("transfer-interval-ticks")).intValue());
43 assertEquals(32, ((Number) yaml.get("maximum-connection-range")).intValue());
44 assertEquals("minecraft:iron_ingot", yaml.get("pipe-cost-item"));
45
46 Map<String, Object> messages = (Map<String, Object>) yaml.get("messages");
47 Set<String> keys = Set.of("connected", "disconnected", "too-far", "no-route", "invalid-container");
48 assertTrue(((Map<String, Object>) messages.get("nl")).keySet().containsAll(keys));
49 assertTrue(((Map<String, Object>) messages.get("en")).keySet().containsAll(keys));
50 }
51
52 private static Map<String, Object> loadYaml(String name) throws IOException {
53 try (InputStream in = PluginConfigTest.class.getClassLoader().getResourceAsStream(name)) {
54 assertNotNull(in, name);
55 return new Yaml().load(in);
56 }
57 }
58
59 private static String gradleVersion() throws IOException {
60 Path gradle = Path.of("build.gradle.kts");
61 if (!Files.isRegularFile(gradle)) gradle = Path.of("..", "build.gradle.kts");
62 for (String line : Files.readAllLines(gradle, StandardCharsets.UTF_8)) {
63 line = line.trim();
64 if (line.startsWith("version = \"")) {
65 return line.substring("version = \"".length(), line.length() - 1);
66 }
67 }
68 throw new IOException("version not found");
69 }
70}