steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/client_config' into feature/client_navigation

Browse source 
pulling in checkstyle to unblock CI
This commit is contained in:
Rithvik Sriram 2025-12-04 18:55:11 +01:00
commit 79b3c0a967
4 changed files with 60 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/main/java/client/utils/Config.java
View file

@ -5,14 +5,11 @@ import java.util.List;
public class Config {
/*
Sets parameters for what the config file needs with a config
Object that will be used in the ConfigService object
*/
private String language = "en";
private String serverUrl = "http://localhost:8080";
private List<String> favourites = new ArrayList<>();
private List<Long> favourites = new ArrayList<>();
private List<String> shoppingList = new ArrayList<>();
public Config(){}
@ -25,7 +22,7 @@ public class Config {
return shoppingList;
}
public List<String> getFavourites() {
public List<Long> getFavourites() {
return favourites;
}
@ -41,7 +38,7 @@ public class Config {
this.serverUrl = serverUrl;
}
public void setFavourites(List<String> favourites) {
public void setFavourites(List<Long> favourites) {
this.favourites = favourites;
}

26
client/src/main/java/client/utils/ConfigService.java
View file

@ -1,8 +1,7 @@
package client.utils;
import com.fasterxml.jackson.core.exc.StreamReadException;
import com.fasterxml.jackson.databind.DatabindException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.nio.file.Path;
@ -31,21 +30,18 @@ public class ConfigService {
*/
private void load(){
File file = configPath.toFile(); //reads the config file as file
if(file.exists()){
try{
config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute
if (!file.exists()) { //if file doesn't exist then it creates a config object
config = new Config();
return;
}
} catch (StreamReadException e) {
throw new RuntimeException(e);
} catch (DatabindException e) {
throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
else{
config = new Config(); // if file doesn't exist, it creates one
try{
config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute
} catch (IOException e) {
throw new RuntimeException(e);
}
}
public Path getConfigPath() {

29
client/src/test/java/client/scenes/ConfigServiceTest.java
View file

@ -2,10 +2,13 @@ package client.scenes;
import client.utils.Config;
import client.utils.ConfigService;
import client.utils.ServerUtils;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@ -15,12 +18,23 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
public class ConfigServiceTest {
static ServerUtils dv = new ServerUtils();
private static final long TEST_ID_A = 23412L;
private static final long TEST_ID_B = 25412L;
@BeforeEach
public void setup(){
Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");
}
/*
Tests if the config file loads properly with a prewritten json file
*/
@Test
public void ConfigServiceFileLoadTest(@TempDir Path tempDir) throws IOException {
public void configServiceFileLoadTest(@TempDir Path tempDir) throws IOException {
Path configPath = tempDir.resolve("config.json");
String json = """
@ -39,9 +53,10 @@ public class ConfigServiceTest {
assertEquals("de", config.getLanguage());
assertEquals("http://exmple12.com", config.getServerUrl());
List<String> x = new ArrayList<>();
x.add("banana bread");
x.add("pineapple pie");
List<Long> x = new ArrayList<>();
x.add(TEST_ID_A);
x.add(TEST_ID_B);
List<String> y = new ArrayList<>();
y.add("milk");
@ -56,7 +71,7 @@ public class ConfigServiceTest {
Tests if the save method saves changes to the config file.
*/
@Test
public void ConfigSaveTest(@TempDir Path tempDir) throws IOException {
public void configSaveTest(@TempDir Path tempDir) throws IOException {
Path configPath = tempDir.resolve("config.json");
ConfigService configService = new ConfigService(configPath);
@ -78,4 +93,4 @@ public class ConfigServiceTest {
}
}

31
client/src/test/java/client/scenes/ConfigTest.java
View file

@ -1,6 +1,9 @@
package client.scenes;
import client.utils.Config;
import client.utils.ServerUtils;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@ -8,9 +11,21 @@ import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.*;
public class ConfigTest {
static ServerUtils dv = new ServerUtils();
private static final long FAV_LIST_ID_1 = 1234L;
private static final long FAV_LIST_ID_2 = 1235L;
@BeforeEach
public void setup(){
Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");
}
@Test
public void ConfigDefaultValueTest(){
public void configDefaultValueTest(){
Config config = new Config();
assertEquals("en", config.getLanguage());
assertEquals("http://localhost:8080", config.getServerUrl());
@ -19,19 +34,19 @@ public class ConfigTest {
}
@Test
public void ConfigGetterTest(){
public void configGetterTest(){
Config config = new Config();
config.setLanguage("nl");
config.setServerUrl("http://localhost:8081");
ArrayList<String> x = new ArrayList<>();
x.add("Lava Cake");
x.add("Brownie");
config.setFavourites(x);
assertEquals(config.getFavourites(), x);
ArrayList<Long> y = new ArrayList<>();
y.add(FAV_LIST_ID_1);
y.add(FAV_LIST_ID_2);
config.setFavourites(y);
assertEquals(config.getFavourites(), y);
config.setShoppingList(x);
assertEquals(config.getShoppingList(), x);
}
}
}