Merge branch 'main' into dependabot/github_actions/gradle/actions-4.1.0

Author: sbouchet

Diff for: .gitignore

@@ -8,3 +8,4 @@ bin/
 
 lsp/
 /.run/
+/.intellijPlatform/

Diff for: src/it/java/org/jboss/tools/intellij/openshift/utils/odo/OdoCliComponentTest.java

@@ -10,16 +10,21 @@
  ******************************************************************************/
 package org.jboss.tools.intellij.openshift.utils.odo;
 
+import com.intellij.util.io.ZipUtil;
 import com.redhat.devtools.intellij.common.utils.ExecHelper;
+import org.apache.commons.io.FileUtils;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -30,12 +35,13 @@
 
 @RunWith(Parameterized.class)
 public class OdoCliComponentTest extends OdoCliTest {
-  private static final String COMPONENT_PATH = "src/it/projects/go";
+  private static final String PROJECT_NAME = "go";
+  private static final String COMPONENT_PATH = "src/it/projects/";
   private final ComponentFeature feature;
   private String project;
   private String component;
   private String service;
-  private final String projectPath = new File(COMPONENT_PATH).getAbsolutePath();
+  private final String projectPath = new File(COMPONENT_PATH + PROJECT_NAME).getAbsolutePath();
 
   public OdoCliComponentTest(ComponentFeature feature, String label) {
     this.feature = feature;
@@ -49,6 +55,18 @@ public static Iterable<Object[]> data() {
     });
   }
 
+  @BeforeClass
+  public static void initTestProject() throws IOException {
+    Path destDir = new File(COMPONENT_PATH).toPath();
+    Path srcFile = new File(COMPONENT_PATH + PROJECT_NAME + ".zip").toPath();
+    ZipUtil.extract(srcFile, destDir, null);
+  }
+
+  @AfterClass
+  public static void deleteTestProject() throws IOException {
+    FileUtils.deleteDirectory(new File(COMPONENT_PATH));
+  }
+
   @Before
   public void initTestEnv() throws IOException {
     project = PROJECT_PREFIX + random.nextInt();
@@ -127,13 +145,16 @@ public void checkCreateComponentAndLinkService() throws IOException, ExecutionEx
     Binding binding = odo.link(projectPath, target);
     assertNotNull(binding);
     List<Binding> bindings = odo.listBindings(projectPath);
+    assertNotNull(bindings);
     assertEquals(1, bindings.size());
-    //cleanup
+    // cleanup
     odo.deleteBinding(projectPath, binding.getName());
     bindings = odo.listBindings(projectPath);
+    assertNotNull(bindings);
     assertEquals(0, bindings.size());
     odo.deleteService(project, deployedService);
     deployedServices = odo.getServices(project);
+    assertNotNull(deployedServices);
     assertEquals(0, deployedServices.size());
   }