Skip to content

test: Fix NPE when running tests & enable these tests on CI #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zoriot merged 1 commit into from
Oct 22, 2026
Merged

test: Fix NPE when running tests & enable these tests on CI #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v7

- name: Set up JDK 21
uses: actions/setup-java@v5
uses: actions/setup-java@v6
with:
java-version: '21'
distribution: 'temurin'
Expand All @@ -32,7 +32,7 @@ jobs:
uses: gradle/actions/setup-gradle@v6

- name: Build with Gradle Wrapper
run: ./gradlew clean build
run: ./gradlew build

- uses: actions/upload-artifact@v7
with:
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/buildtheearth/buildteamtools/modules/network/model/BuildTeam.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ public BuildTeam(String ID, String serverIP, String name, String blankName, Stri
this.allowsTransfers = allowsTransfers;
this.tag = tag;

if (isConnected && NetworkModule.getInstance().getBuildTeam() != null && NetworkModule.getInstance().getBuildTeam().isConnected())
if (isConnected && (NetworkModule.getInstance() == null ||
(NetworkModule.getInstance().getBuildTeam() != null && NetworkModule.getInstance().getBuildTeam().isConnected())))
this.IP = null;
else
this.IP = (!isConnected) ? serverIP : tag.toLowerCase() + ".buildtheearth.net";
Expand Down
2 changes: 0 additions & 2 deletions ...ava/net/buildtheearth/buildteamtools/modules/network/model/BuildTeamRoutingStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package net.buildtheearth.buildteamtools.modules.network.model;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;

import static org.junit.jupiter.api.Assertions.*;

@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
class BuildTeamRoutingStateTest {

@Test
Expand Down
Loading