Skip to content

Commit c072812

Browse files
ryanjbaxterryanjbaxter
committed
Revert "Removing tests for release"
This reverts commit 8a6e73d.
1 parent 8a6e73d commit c072812

File tree

3 files changed

+52
-0
lines changed

3 files changed

+52
-0
lines changed

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerAllNamespacesTests.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,32 @@
2424
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2525
import io.fabric8.kubernetes.client.Config;
2626
import io.fabric8.kubernetes.client.KubernetesClient;
27+
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
28+
import org.junit.Ignore;
2729
import org.junit.jupiter.api.Assertions;
30+
import org.junit.jupiter.api.BeforeAll;
31+
import org.junit.jupiter.api.Test;
2832

33+
import org.springframework.beans.factory.annotation.Autowired;
34+
import org.springframework.boot.test.context.SpringBootTest;
35+
import org.springframework.boot.web.server.LocalServerPort;
36+
import org.springframework.test.context.TestPropertySource;
2937
import org.springframework.web.client.RestTemplate;
3038

39+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
40+
@TestPropertySource(properties = "spring.cloud.kubernetes.discovery.all-namespaces=true")
41+
@EnableKubernetesMockClient(crud = true, https = false)
3142
class LoadBalancerAllNamespacesTests {
3243

44+
@Autowired
3345
RestTemplate restTemplate;
3446

47+
@LocalServerPort
3548
int randomServerPort;
3649

3750
static KubernetesClient client;
3851

52+
@BeforeAll
3953
static void setup() {
4054
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
4155
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -45,6 +59,8 @@ static void setup() {
4559
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
4660
}
4761

62+
@Test
63+
@Ignore
4864
void testLoadBalancerDifferentNamespace() {
4965
createTestData();
5066
String response = restTemplate.getForObject("http://service-b/greeting", String.class);

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerTests.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,29 @@
2222
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2323
import io.fabric8.kubernetes.client.Config;
2424
import io.fabric8.kubernetes.client.KubernetesClient;
25+
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
2526
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.BeforeAll;
28+
import org.junit.jupiter.api.Test;
2629

30+
import org.springframework.beans.factory.annotation.Autowired;
31+
import org.springframework.boot.test.context.SpringBootTest;
32+
import org.springframework.boot.web.server.LocalServerPort;
2733
import org.springframework.web.client.RestTemplate;
2834

35+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
36+
@EnableKubernetesMockClient(crud = true, https = false)
2937
class LoadBalancerTests {
3038

39+
@Autowired
3140
RestTemplate restTemplate;
3241

42+
@LocalServerPort
3343
int randomServerPort;
3444

3545
static KubernetesClient client;
3646

47+
@BeforeAll
3748
static void setup() {
3849
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
3950
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -43,13 +54,15 @@ static void setup() {
4354
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
4455
}
4556

57+
@Test
4658
void testLoadBalancerSameNamespace() {
4759
createTestData("service-a", "test");
4860
String response = restTemplate.getForObject("http://service-a/greeting", String.class);
4961
Assertions.assertNotNull(response);
5062
Assertions.assertEquals("greeting", response);
5163
}
5264

65+
@Test
5366
void testLoadBalancerDifferentNamespace() {
5467
createTestData("service-b", "b");
5568
Assertions.assertThrows(IllegalStateException.class,

‎spring-cloud-kubernetes-integration-tests/load-balancer/src/test/java/org/springframework/cloud/kubernetes/fabric8/loadbalancer/LoadBalancerWithServiceTests.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,46 @@
2323
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
2424
import io.fabric8.kubernetes.client.Config;
2525
import io.fabric8.kubernetes.client.KubernetesClient;
26+
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
27+
import org.junit.Ignore;
2628
import org.junit.jupiter.api.Assertions;
29+
import org.junit.jupiter.api.BeforeAll;
30+
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Test;
2732
import org.slf4j.Logger;
2833
import org.slf4j.LoggerFactory;
2934

35+
import org.springframework.beans.factory.annotation.Autowired;
36+
import org.springframework.boot.test.context.SpringBootTest;
37+
import org.springframework.boot.test.mock.mockito.MockBean;
38+
import org.springframework.boot.web.server.LocalServerPort;
3039
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesServiceInstance;
40+
import org.springframework.test.context.TestPropertySource;
3141
import org.springframework.web.client.RestTemplate;
3242

3343
import static org.mockito.ArgumentMatchers.any;
3444
import static org.mockito.Mockito.when;
3545

46+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
47+
@TestPropertySource(properties = { "spring.cloud.kubernetes.loadbalancer.mode=SERVICE",
48+
"spring.cloud.kubernetes.loadbalancer.enabled=true" })
49+
@EnableKubernetesMockClient(crud = true, https = false)
3650
class LoadBalancerWithServiceTests {
3751

3852
private static final Logger LOGGER = LoggerFactory.getLogger(LoadBalancerWithServiceTests.class);
3953

54+
@Autowired
4055
RestTemplate restTemplate;
4156

57+
@LocalServerPort
4258
int randomServerPort;
4359

60+
@MockBean
4461
Fabric8ServiceInstanceMapper mapper;
4562

4663
static KubernetesClient client;
4764

65+
@BeforeAll
4866
static void setup() {
4967
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY, client.getConfiguration().getMasterUrl());
5068
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
@@ -55,19 +73,24 @@ static void setup() {
5573

5674
}
5775

76+
@BeforeEach
5877
public void before() {
5978
KubernetesServiceInstance instance = new KubernetesServiceInstance("serviceinstance", "service", "localhost",
6079
randomServerPort, Collections.EMPTY_MAP, false);
6180
when(mapper.map(any())).thenReturn(instance);
6281
}
6382

83+
@Test
84+
@Ignore
6485
void testLoadBalancerSameNamespace() {
6586
createTestData("service-a", "test");
6687
String response = restTemplate.getForObject("http://service-a/greeting", String.class);
6788
Assertions.assertNotNull(response);
6889
Assertions.assertEquals("greeting", response);
6990
}
7091

92+
@Test
93+
@Ignore
7194
void testLoadBalancerDifferentNamespace() {
7295
createTestData("service-b", "b");
7396
Assertions.assertThrows(IllegalStateException.class,

0 commit comments

Comments
 (0)