[issue 1269] (2.0.x) Bumping Fabric8 version to 6.9.2

.circleci/config.yml

@@ -73,5 +73,5 @@ workflows:
       - build:
           matrix:
             parameters:
-              jdk-version: ["8.0"] # TODO: Add JDK 11.0 when builds for JDK8 work
-              category: ["docker"] # TODO: Add builds for kubernetes and openshift
+              jdk-version: ["11.0"] # TODO: Add JDK 11.0 when builds for JDK8 work
+              category: ["docker"] # TODO: Add builds for kubernetes and openshift

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip

core/pom.xml

@@ -84,7 +84,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

core/src/main/java/org/arquillian/cube/impl/util/Timespan.java

@@ -84,7 +84,7 @@ public String getDisplayChar() {
         final List<TimeUnit> timeUnits = Arrays.asList(TimeUnit.values());
         Collections.reverse(timeUnits);
 
-        TIME_UNIT_ORDER = (TimeUnit[]) timeUnits.toArray();
+        TIME_UNIT_ORDER = timeUnits.toArray(new TimeUnit[timeUnits.size()]);
     }
 
     static {

core/src/test/java/org/arquillian/cube/impl/client/container/ContainerConfigurationControllerTest.java

@@ -24,6 +24,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.yaml.snakeyaml.Yaml;
 
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -67,7 +68,7 @@ public void setup() {
         Map<String, Object> content = (Map<String, Object>) yaml.load(CONTENT);
 
         when(cube.getId()).thenReturn(CUBE_ID);
-        when(cube.configuration()).thenReturn(content);
+        lenient().when(cube.configuration()).thenReturn(content);
         when(cube.getMetadata(HasPortBindings.class)).thenReturn(
             new TestPortBindings(new Binding("localhost").addPortBinding(8089, 8090)));
         when(container.getName()).thenReturn(CUBE_ID);

core/src/test/java/org/arquillian/cube/impl/client/container/CubeContainerLifecycleControllerTest.java

@@ -29,6 +29,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -164,7 +165,7 @@ public void shouldUseOverriddenCubeId() {
         Map<String, String> containerConfig = new HashMap<String, String>();
         containerConfig.put("cubeId", CUBE_ID);
 
-        when(container.getName()).thenReturn(MISSING_CUBE_ID);
+        lenient().when(container.getName()).thenReturn(MISSING_CUBE_ID);
         when(containerDef.getContainerProperties()).thenReturn(containerConfig);
 
         shouldCreateAndStartCubeDuringBeforeStart();

core/src/test/java/org/arquillian/cube/impl/client/container/ProtocolMetaDataUpdaterTestCase.java

@@ -123,7 +123,7 @@ public void shouldUpdateWithIPFromDocker() throws Exception {
     public void shouldNotUpdateIfContainerNotMapped() throws Exception {
         Binding binding = new Binding(GATEWAY_IP);
         binding.addPortBinding(EXPOSED_PORT, EXPOSED_PORT);
-        Mockito.when(cube.getMetadata(HasPortBindings.class)).thenReturn(new TestPortBindings(binding));
+        Mockito.lenient().when(cube.getMetadata(HasPortBindings.class)).thenReturn(new TestPortBindings(binding));
 
         bind(ContainerScoped.class,
             Container.class,

docker/assertj/src/main/java/com/github/dockerjava/assertions/ImagesAssert.java

@@ -6,8 +6,6 @@
 import java.util.List;
 import org.assertj.core.api.ListAssert;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 /**
  * @author Eddú Meléndez
  */
@@ -22,12 +20,12 @@ public ImagesAssert containsImages(String... imageIds) {
         for (Image image : this.actual) {
             imageList.add(image.getId());
         }
-    /** rls TODO https://github.com/arquillian/arquillian-cube/issues/1289
-        assertThat(this.actual)
+
+        org.assertj.core.api.Assertions.assertThat(this.actual)
             .extracting("id")
             .overridingErrorMessage("%nExpecting:%n <%s>%nto contain:%n <%s>", imageList, Arrays.asList(imageIds))
             .contains(imageIds);
-     **/
+
         return this;
     }
 }

docker/docker/pom.xml

@@ -105,7 +105,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
 

docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/config/ExposedPort.java

@@ -15,6 +15,12 @@ public ExposedPort(int exposed, String type) {
         }
     }
 
+    public ExposedPort(final String exp) {
+        final ExposedPort parsed = valueOf(exp);
+        this.exposed = parsed.exposed;
+        this.type = parsed.type;
+    }
+
     public static ExposedPort valueOf(String exp) {
         int exposed;
         String type = null;

docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/config/Image.java

@@ -9,6 +9,12 @@ public Image(String name, String tag) {
         this.tag = tag;
     }
 
+    public Image(final String nameAndTag) {
+        final Image parsed = valueOf(nameAndTag);
+        this.name = parsed.name;
+        this.tag = parsed.tag;
+    }
+
     public static Image valueOf(String image) {
         String name = null;
         String tag = null;

docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/config/Link.java

@@ -14,6 +14,12 @@ public Link(String name, String alias) {
         this.alias = alias;
     }
 
+    public Link(final String links) {
+        final Link parsed = valueOf(links);
+        this.name = parsed.name;
+        this.alias = parsed.alias;
+    }
+
     public static Link valueOf(String links) {
         String[] link = links.split(":");
         String name = link[0];

docker/docker/src/main/java/org/arquillian/cube/docker/impl/client/config/PortBinding.java

@@ -16,6 +16,13 @@ public PortBinding(String host, int bound, ExposedPort exposed) {
         this.exposed = exposed;
     }
 
+    public PortBinding(final String portBinding) {
+        final PortBinding parsed = valueOf(portBinding);
+        this.host = parsed.host;
+        this.bound = parsed.bound;
+        this.exposed = parsed.exposed;
+    }
+
     public static PortBinding valueOf(String portBinding) {
         ExposedPort exposed;
         int bound;

docker/docker/src/test/java/org/arquillian/cube/docker/impl/await/DockerHealthAwaitStrategyTest.java

@@ -47,7 +47,7 @@ public class DockerHealthAwaitStrategyTest {
     @BeforeClass
     public static void createDockerClient() {
         if (!System.getenv().containsKey(DOCKER_HOST) || System.getenv(DOCKER_HOST).equals("")){
-            environmentVariables.set(DOCKER_HOST, "unix:///var/run/docker.sock");
+            environmentVariables.set(DOCKER_HOST, "unix:///var/run/podman.sock");
         }
         dockerClient = DockerClientBuilder.getInstance().build();
         healthSuccessImageId = dockerBuild("DockerHealthAwait/HealthSuccess/Dockerfile");

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeConfiguratorTest.java

@@ -40,6 +40,7 @@
 import static org.hamcrest.collection.IsMapContaining.hasKey;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -76,8 +77,8 @@ private static Matcher<String> pathEndsWith(String suffix) {
     }
 
     private void bindNonExistingDockerSocketOS() {
-        when(operatingSystem.getDefaultFamily()).thenReturn(operatingSystemFamily);
-        when(operatingSystem.getFamily()).thenReturn(OperatingSystemFamily.MAC);
+        lenient().when(operatingSystem.getDefaultFamily()).thenReturn(operatingSystemFamily);
+        lenient().when(operatingSystem.getFamily()).thenReturn(OperatingSystemFamily.MAC);
         when(operatingSystemFamily.getServerUri()).thenReturn("non/existing/path");
 
         bind(ApplicationScoped.class, OperatingSystemInterface.class, operatingSystem);
@@ -107,8 +108,8 @@ public void shouldChangeServerUriInCaseOfRunningDockerInsideDocker() {
         config.put(CubeDockerConfiguration.DOCKER_URI, "https://dockerHost:22222");
 
         when(extensionDef.getExtensionProperties()).thenReturn(config);
-        when(arquillianDescriptor.extension("docker")).thenReturn(extensionDef);
-        when(commandLineExecutor.execCommand("boot2docker", "ip")).thenReturn("192.168.0.1");
+        lenient().when(arquillianDescriptor.extension("docker")).thenReturn(extensionDef);
+        lenient().when(commandLineExecutor.execCommand("boot2docker", "ip")).thenReturn("192.168.0.1");
         when(commandLineExecutor.execCommand("docker-machine")).thenThrow(new RuntimeException());
         when(top.isSpinning()).thenReturn(true);
 
@@ -127,7 +128,7 @@ public void shouldNotChangeServerUriInCaseODockerInsideDockerIfItIsDisabled() {
         when(commandLineExecutor.execCommand("boot2docker", "ip")).thenReturn("192.168.0.1");
         when(commandLineExecutor.execCommand("docker-machine")).thenThrow(new RuntimeException());
 
-        when(top.isSpinning()).thenReturn(true);
+        lenient().when(top.isSpinning()).thenReturn(true);
 
         fire(new CubeConfiguration());
         assertThat(config, hasEntry(CubeDockerConfiguration.DOCKER_URI, "tcp://192.168.0.1:22222"));

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeDockerConfigurationResolverTest.java

@@ -19,7 +19,6 @@
 import org.arquillian.cube.docker.impl.util.Top;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.runner.RunWith;
@@ -31,6 +30,7 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -94,7 +94,7 @@ public void shouldDetectsValidDockerDefault() throws Exception {
         String sockUri = isWindows ?sockURL.toExternalForm().replace("file:/", "") : "unix://" + sockURL.toExternalForm();
         when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
         when(operatingSystemInterface.getDefaultFamily()).thenReturn(defaultOperatingSystemFamilyInterface);
-        when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.MAC_OSX.getFamily());
+        lenient().when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.MAC_OSX.getFamily());
 
         Map<String, String> config = new HashMap<>();
 
@@ -116,7 +116,7 @@ public void shouldSkipsInvalidDockerDefault() throws Exception {
             new Boot2Docker(boot2dockerCommandLineExecutor),
             mockDefaultDocker(),
             operatingSystemInterface);
-        when(boot2dockerCommandLineExecutor.execCommand(ArgumentMatchers.<String>any())).thenReturn("127.0.0.1");
+        when(boot2dockerCommandLineExecutor.execCommand(anyString(), anyString())).thenReturn("127.0.0.1");
 
         String sockUri = "unix:///a/path-that/does/not/exist";
         when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
@@ -139,11 +139,11 @@ public void shouldNotSetTlsVerifyForTcpSchemeOnOSX() {
             mockDefaultDocker(),
             operatingSystemInterface);
 
-        when(infoCmd.exec()).thenThrow(new ProcessingException("test exception"));
+        lenient().when(infoCmd.exec()).thenThrow(new ProcessingException("test exception"));
         String sockUri = "unix:///a/path-that/does/not/exist";
-        when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
-        when(operatingSystemInterface.getDefaultFamily()).thenReturn(defaultOperatingSystemFamilyInterface);
-        when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.MAC_OSX.getFamily());
+        lenient().when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
+        lenient().when(operatingSystemInterface.getDefaultFamily()).thenReturn(defaultOperatingSystemFamilyInterface);
+        lenient().when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.MAC_OSX.getFamily());
 
         Map<String, String> config = new HashMap<>();
         config.put(CubeDockerConfiguration.DOCKER_URI, "tcp://localhost:2376");
@@ -161,12 +161,12 @@ public void shouldNotSetTlsVerifyForTcpSchemeOnLinux() {
             new Boot2Docker(null),
             mockDefaultDocker(),
             operatingSystemInterface);
-        when(infoCmd.exec()).thenThrow(new ProcessingException("test exception"));
+        lenient().when(infoCmd.exec()).thenThrow(new ProcessingException("test exception"));
 
         String sockUri = "unix:///a/path-that/does/not/exist";
-        when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
-        when(operatingSystemInterface.getDefaultFamily()).thenReturn(defaultOperatingSystemFamilyInterface);
-        when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.LINUX_OS.getFamily());
+        lenient().when(defaultOperatingSystemFamilyInterface.getServerUri()).thenReturn(sockUri);
+        lenient().when(operatingSystemInterface.getDefaultFamily()).thenReturn(defaultOperatingSystemFamilyInterface);
+        lenient().when(operatingSystemInterface.getFamily()).thenReturn(OperatingSystem.LINUX_OS.getFamily());
 
         Map<String, String> config = new HashMap<>();
         config.put(CubeDockerConfiguration.DOCKER_URI, "tcp://localhost:2376");

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/CubeSuiteLifecycleControllerTest.java

@@ -24,6 +24,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -111,9 +112,9 @@ public void shouldCreateAndStartAutoContainersWhenNoAutoStartIsProvided() {
         ContainerRegistry containerRegistry = mock(ContainerRegistry.class);
         List<org.jboss.arquillian.container.spi.Container> containers = new ArrayList<>();
         org.jboss.arquillian.container.spi.Container container = mock(org.jboss.arquillian.container.spi.Container.class);
-        when(container.getName()).thenReturn("a");
+        lenient().when(container.getName()).thenReturn("a");
         containers.add(container);
-        when(containerRegistry.getContainers()).thenReturn(containers);
+        lenient().when(containerRegistry.getContainers()).thenReturn(containers);
 
         bind(ApplicationScoped.class, ContainerRegistry.class, containerRegistry);
 

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/container/DockerServerIPConfiguratorTest.java

@@ -1,5 +1,6 @@
 package org.arquillian.cube.docker.impl.client.container;
 
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -89,7 +90,7 @@ public void setup() {
         Map<String, Object> content = (Map<String, Object>) yaml.load(CONTENT);
 
         when(cube.getId()).thenReturn(CUBE_ID);
-        when(cube.configuration()).thenReturn(content);
+        lenient().when(cube.configuration()).thenReturn(content);
         when(container.getName()).thenReturn(CUBE_ID);
         when(container.getDeployableContainer()).thenReturn(deployableContainer);
         when(deployableContainer.getConfigurationClass()).thenReturn(ContainerConfiguration.class);

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/containerobject/DockerContainerObjectBuilderTest.java

@@ -195,7 +195,7 @@ public void shouldLinkInnerContainersWithoutLink() {
         verify(cubeController, times(1)).create("containerWithNonAnnotatedLink");
         verify(cubeController, times(1)).start("containerWithNonAnnotatedLink");
 
-        verify(cubeContainerObjectTestEnricher, times(1)).enrich(any(TestContainerObjectWithAnnotatedLink.class));
+        verify(cubeContainerObjectTestEnricher, times(1)).enrich(any(TestContainerObjectWithNonAnnotatedLink.class));
     }
 
     @Test

docker/docker/src/test/java/org/arquillian/cube/docker/impl/client/containerobject/dsl/ContainerNetworkObjectDslTestEnricherTest.java

@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -46,7 +47,7 @@ public void should_start_a_network() {
         containerNetworkObjectDslTestEnricher.networkRegistryInstance = () -> networkRegistry;
         containerNetworkObjectDslTestEnricher.dockerClientExecutorInstance = () -> dockerClientExecutor;
 
-        when(injector.inject(any(Network.class))).then(invocation -> invocation.getArgument(0, Network.class));
+        lenient().when(injector.inject(any(Network.class))).then(invocation -> invocation.getArgument(0, Network.class));
         when(dockerClientExecutor.createNetwork(eq("default"), any(org.arquillian.cube.docker.impl.client.config.Network.class))).thenReturn("default");
 
         containerNetworkObjectDslTestEnricher.enrich(new NetworkTest());