diff --git a/resources/pinemhi/pinemhi.ini b/resources/pinemhi/pinemhi.ini
index 3d2574bf7..9f34f5bdd 100644
--- a/resources/pinemhi/pinemhi.ini
+++ b/resources/pinemhi/pinemhi.ini
@@ -1,5 +1,5 @@
[paths]
-VP=C:/vPinball/visualpinball/VPinMAME/nvram/
+VP=C:/workspace/vpin-studio/vpin-studio-server/../testsystem/vPinball/VisualPinball/VPinMAME/nvram/
FP=C:\vPinball\Future Pinball\fpRAM
[options]
diff --git a/testsystem/vPinball/PinUPSystem/PUPDatabase.db b/testsystem/vPinball/PinUPSystem/PUPDatabase.db
index ca2dcedc5..d5f1f8879 100644
Binary files a/testsystem/vPinball/PinUPSystem/PUPDatabase.db and b/testsystem/vPinball/PinUPSystem/PUPDatabase.db differ
diff --git a/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml b/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml
index 196357708..8b51e3172 100644
--- a/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml
+++ b/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml
@@ -7,7 +7,7 @@
True
True
True
- 2024-07-30 20:51:28
+ 2024-09-10 18:47:46
Jaws
@@ -17,7 +17,7 @@
True
True
True
- 2024-07-30 20:51:28
+ 2024-09-10 18:47:46
Twister (1996)
@@ -28,6 +28,6 @@
True
True
Test Osterone
- 2024-07-30 20:51:28
+ 2024-09-10 18:47:46
\ No newline at end of file
diff --git a/testsystem/vpin-studio.db b/testsystem/vpin-studio.db
index bf889c638..39e4235b6 100644
Binary files a/testsystem/vpin-studio.db and b/testsystem/vpin-studio.db differ
diff --git a/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java b/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
index 29e2984e5..0613598ec 100644
--- a/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
+++ b/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
@@ -55,18 +55,18 @@ public void testMameDownloadSimulated() throws Exception {
assertNull(install.getStatus());
}
-// @Test
- public void testMameDiff() throws Exception {
- GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/pinmame/releases", Arrays.asList("win-", "VPinMAME"), Arrays.asList("linux", "sc-", "osx"));
- assertNotNull(githubRelease);
- ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
- ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPMAlias.txt"), Collections.emptyList(), "*.dll");
- assertNotNull(install);
- assertFalse(install.getLogs().isEmpty());
- assertFalse(install.getDiffEntries().isEmpty());
- assertNull(install.getStatus());
- }
+// public void testMameDiff() throws Exception {
+// GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/pinmame/releases", Arrays.asList("win-", "VPinMAME"), Arrays.asList("linux", "sc-", "osx"));
+// assertNotNull(githubRelease);
+//
+// ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
+// ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPMAlias.txt"), Collections.emptyList(), "*.dll");
+// assertNotNull(install);
+// assertFalse(install.getLogs().isEmpty());
+// assertFalse(install.getDiffEntries().isEmpty());
+// assertNull(install.getStatus());
+// }
@Test
@@ -109,18 +109,17 @@ public void testVpx2() throws Exception {
}
- @Test
- public void testVpxDiff() throws Exception {
- GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/vpinball/releases", Collections.emptyList(), Arrays.asList("Debug"));
- assertNotNull(githubRelease);
-
- ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
- ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPinballX64.exe", "VPinballX.exe", "VPinballX_GL.exe"), Collections.emptyList());
- assertNotNull(install);
- assertNull(install.getStatus());
- assertFalse(install.getDiffEntries().isEmpty());
-
- }
+// @Test
+// public void testVpxDiff() throws Exception {
+// GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/vpinball/releases", Collections.emptyList(), Arrays.asList("Debug"));
+// assertNotNull(githubRelease);
+//
+// ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
+// ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPinballX64.exe", "VPinballX.exe", "VPinballX_GL.exe"), Collections.emptyList());
+// assertNotNull(install);
+// assertNull(install.getStatus());
+// assertFalse(install.getDiffEntries().isEmpty());
+// }
@Test
public void testBackglass() throws Exception {
diff --git a/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java b/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
index 5897bf394..adb5c2211 100644
--- a/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
+++ b/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
@@ -34,6 +34,11 @@ public void testCorruption() throws IOException {
List tables = vps.getTables();
for (VpsTable table : tables) {
+ if(table == null || table.getB2sFiles() == null) {
+ System.out.println(table);
+ continue;
+ }
+
for (VpsBackglassFile b2sFile : table.getB2sFiles()) {
if(b2sFile.getId() == null) {
System.out.println(table.getName());
diff --git a/vpin-studio-app/dependency-reduced-pom.xml b/vpin-studio-app/dependency-reduced-pom.xml
index 17eac55af..608e5e44d 100644
--- a/vpin-studio-app/dependency-reduced-pom.xml
+++ b/vpin-studio-app/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
studio
de.mephisto.vpin
- 3.4.1
+ 3.5.2
4.0.0
vpin-studio-app