Fix VSCodeAPITest

eclipse · Feb 4, 2025 · e613e05 · e613e05
1 parent 9856e04
commit e613e05
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/server/src/test/java/org/eclipse/openvsx/adapter/VSCodeAPITest.java b/server/src/test/java/org/eclipse/openvsx/adapter/VSCodeAPITest.java
@@ -33,8 +33,6 @@
 import org.eclipse.openvsx.storage.*;
 import org.eclipse.openvsx.util.TargetPlatform;
 import org.eclipse.openvsx.util.VersionService;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -54,7 +52,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.transaction.support.TransactionTemplate;
-import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -281,7 +278,7 @@ void testWebResourceAsset() throws Exception {
         var namespaceName = "EditorConfig";
         var extensionName = "EditorConfig";
         var version = "0.16.6";
-        var path = mockWebResourceAsset(namespaceName, extensionName, TargetPlatform.NAME_UNIVERSAL, version);
+        var path = mockWebResourceAsset(namespaceName, extensionName, version);
         var bytes = new byte[0];
         try(var zip = new ZipFile(path.toFile())) {
             var entry = zip.getEntry("extension/EditorConfig_icon.png");
@@ -818,15 +815,11 @@ private Path mockExtensionBrowse(String namespaceName, String extensionName, Str
         return mockExtensionBrowse(namespaceName, extensionName, targetPlatform, version, true);
     }
 
-    private Path mockWebResourceAsset(String namespaceName, String extensionName, String targetPlatform, String version) throws IOException {
-        return mockExtensionBrowse(namespaceName, extensionName, targetPlatform, version, false);
+    private Path mockWebResourceAsset(String namespaceName, String extensionName, String version) throws IOException {
+        return mockExtensionBrowse(namespaceName, extensionName, TargetPlatform.NAME_UNIVERSAL, version, false);
     }
 
     private Path mockExtensionBrowse(String namespaceName, String extensionName, String targetPlatform, String version, boolean browse) throws IOException {
-        if(!TargetPlatform.isValid(targetPlatform)) {
-            targetPlatform = TargetPlatform.NAME_UNIVERSAL;
-        }
-
         var namespace = new Namespace();
         namespace.setId(0L);
         namespace.setName(namespaceName);
@@ -846,8 +839,14 @@ private Path mockExtensionBrowse(String namespaceName, String extensionName, Str
         resource.setType(DOWNLOAD);
         resource.setStorageType(STORAGE_LOCAL);
 
-        var path = Path.of("/tmp", namespaceName, extensionName, (!TargetPlatform.isUniversal(targetPlatform) ? targetPlatform : ""), version, resource.getName());
-        path.toFile().mkdirs();
+        var segments = new ArrayList<>(List.of("/tmp", namespace.getName(), extension.getName()));
+        if(!extVersion.isUniversalTargetPlatform()) {
+            segments.add(extVersion.getTargetPlatform());
+        }
+
+        segments.addAll(List.of(extVersion.getVersion(), resource.getName()));
+        var path = Path.of(String.join("/", segments)).toAbsolutePath();
+        Files.createDirectories(path.getParent());
         try (var in = getClass().getResourceAsStream("../EditorConfig.EditorConfig-0.16.6.vsix")) {
             Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING);
         }