3.5.2

syd711 · Sep 10, 2024 · 2e7f7c9 · 2e7f7c9
1 parent 1164fd7
commit 2e7f7c9
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 28 deletions.
diff --git 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
diff --git a/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml b/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml
@@ -7,7 +7,7 @@
     <hidetopper>True</hidetopper>
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
   <game name="Jaws">
     <description>Jaws</description>
@@ -17,7 +17,7 @@
     <hidetopper>True</hidetopper>
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
   <game name="Twister (1996)">
     <description>Twister (1996)</description>
@@ -28,6 +28,6 @@
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
     <author>Test Osterone</author>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
 </menu>
diff --git a/testsystem/vpin-studio.db b/testsystem/vpin-studio.db
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
@@ -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
@@ -34,6 +34,11 @@ public void testCorruption() throws IOException {
 
     List<VpsTable> 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
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>studio</artifactId>
     <groupId>de.mephisto.vpin</groupId>
-    <version>3.4.1</version>
+    <version>3.5.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>vpin-studio-app</artifactId>