Commit eeb2088e authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fixing tests to run during mvn build under issue #2

parent efe1f86c

pom.xml

+0 −12
Original line number Original line Diff line number Diff line
@@ -203,22 +203,10 @@ 
		<dependency>

		<dependency>

			<groupId>org.springframework.boot</groupId>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-test</artifactId>

			<artifactId>spring-boot-starter-test</artifactId>

			<scope>test</scope>

		</dependency>

		</dependency>

		<dependency>

		<dependency>

			<groupId>org.junit.jupiter</groupId>

			<groupId>org.junit.jupiter</groupId>

			<artifactId>junit-jupiter-engine</artifactId>

			<artifactId>junit-jupiter-engine</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.junit.platform</groupId>

			<artifactId>junit-platform-commons</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.junit.platform</groupId>

			<artifactId>junit-platform-runner</artifactId>

			<scope>test</scope>

		</dependency>

		</dependency>

		<dependency>

		<dependency>

			<groupId>org.apache.activemq</groupId>

			<groupId>org.apache.activemq</groupId>

src/test/java/org/etsi/osl/cridge/CridgeIntegrationTest.java

+1 −22
Original line number Original line Diff line number Diff line
@@ -4,12 +4,9 @@ import static io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionCont 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNotNull;

import static org.junit.jupiter.api.Assertions.assertEquals;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.BufferedInputStream;

import java.io.BufferedInputStream;

import java.io.File;

import java.io.FileInputStream;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileNotFoundException;

import java.io.InputStream;

import java.net.HttpURLConnection;

import java.net.HttpURLConnection;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;
@@ -19,28 +16,20 @@ import org.apache.camel.CamelContext; 
import org.apache.camel.RoutesBuilder;

import org.apache.camel.RoutesBuilder;

import org.apache.camel.builder.RouteBuilder;

import org.apache.camel.builder.RouteBuilder;

import org.apache.camel.model.dataformat.JsonLibrary;

import org.apache.camel.model.dataformat.JsonLibrary;

import org.apache.commons.io.IOUtils;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1;

import org.etsi.osl.domain.model.kubernetes.KubernetesSecret;

import org.etsi.osl.domain.model.kubernetes.KubernetesSecret;

import org.etsi.osl.tmf.ri639.model.ResourceCreate;

import org.etsi.osl.tmf.ri639.model.ResourceCreate;

import org.junit.Rule;

import org.junit.jupiter.api.Assertions;

import org.junit.jupiter.api.Assertions;

import org.junit.jupiter.api.Test;

import org.junit.jupiter.api.Test;

import org.junit.runner.RunWith;

import org.slf4j.Logger;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.context.event.ApplicationStartedEvent;

import org.springframework.boot.context.event.ApplicationStartedEvent;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.boot.test.context.TestConfiguration;

import org.springframework.boot.test.context.TestConfiguration;

import org.springframework.boot.test.mock.mockito.MockBean;

import org.springframework.context.event.ContextRefreshedEvent;

import org.springframework.context.event.EventListener;

import org.springframework.context.event.EventListener;

import jakarta.annotation.PostConstruct;

import org.springframework.test.context.event.RecordApplicationEvents;

import org.springframework.test.context.event.RecordApplicationEvents;

import org.springframework.test.context.event.annotation.BeforeTestClass;

import org.springframework.test.context.junit4.SpringRunner;

import io.fabric8.kubernetes.api.model.Condition;

import io.fabric8.kubernetes.api.model.Condition;

import io.fabric8.kubernetes.api.model.GenericKubernetesResource;

import io.fabric8.kubernetes.api.model.GenericKubernetesResource;

import io.fabric8.kubernetes.api.model.KubernetesResource;

import io.fabric8.kubernetes.api.model.KubernetesResource;
@@ -58,7 +47,6 @@ import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition 
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionListBuilder;

import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionListBuilder;

import io.fabric8.kubernetes.client.Config;

import io.fabric8.kubernetes.client.Config;

import io.fabric8.kubernetes.client.ConfigBuilder;

import io.fabric8.kubernetes.client.KubernetesClient;

import io.fabric8.kubernetes.client.KubernetesClient;

import io.fabric8.kubernetes.client.KubernetesClientBuilder;

import io.fabric8.kubernetes.client.KubernetesClientBuilder;

import io.fabric8.kubernetes.client.Watch;

import io.fabric8.kubernetes.client.Watch;
@@ -67,21 +55,12 @@ import io.fabric8.kubernetes.client.WatcherException; 
import io.fabric8.kubernetes.client.dsl.MixedOperation;

import io.fabric8.kubernetes.client.dsl.MixedOperation;

import io.fabric8.kubernetes.client.dsl.Resource;

import io.fabric8.kubernetes.client.dsl.Resource;

import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;

import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;

import io.fabric8.kubernetes.client.extension.ExtensionAdapter.ClientFactory;

import io.fabric8.kubernetes.client.http.HttpClient.Factory;

import io.fabric8.kubernetes.client.impl.ResourceHandler;

import io.fabric8.kubernetes.client.informers.ResourceEventHandler;

import io.fabric8.kubernetes.client.informers.SharedIndexInformer;

import io.fabric8.kubernetes.client.informers.SharedInformerFactory;

import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;

import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;

import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;

import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;

import io.fabric8.kubernetes.client.server.mock.KubernetesServer;

import io.fabric8.kubernetes.client.utils.Serialization;

import io.fabric8.kubernetes.client.utils.Serialization;

import io.fabric8.kubernetes.internal.KubernetesDeserializer;

import io.fabric8.kubernetes.client.impl.Handlers;





@RecordApplicationEvents

@RecordApplicationEvents

@RunWith(SpringRunner.class)

//@RunWith(SpringRunner.class)

@SpringBootTest(properties = {

@SpringBootTest(properties = {





    "kubernetes.master = test_kube",

    "kubernetes.master = test_kube",