From 80f39bea84e5b1a32f937fa5294b944dacad91b6 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Wed, 8 Jul 2020 12:41:56 -0400
Subject: [PATCH] Removed cfenv from dependencies

Updated tests that used it.

resolves #681
---
 spring-cloud-task-core/pom.xml                | 14 ++++++---
 .../micrometer/AbstractMicrometerTest.java    | 31 +++++++++++++++++--
 spring-cloud-task-dependencies/pom.xml        |  9 ------
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/spring-cloud-task-core/pom.xml b/spring-cloud-task-core/pom.xml
index 4b3892d9..6356abda 100755
--- a/spring-cloud-task-core/pom.xml
+++ b/spring-cloud-task-core/pom.xml
@@ -13,6 +13,9 @@
 	<packaging>jar</packaging>
 	<name>Spring Cloud Task Core</name>
 	<description>Spring Cloud Task</description>
+	<properties>
+		<jmock-version>1.49</jmock-version>
+	</properties>
 
 	<dependencies>
 		<dependency>
@@ -109,11 +112,6 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.pivotal.cfenv</groupId>
-			<artifactId>java-cfenv-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
@@ -124,6 +122,12 @@
 			<artifactId>junit-jupiter-engine</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jmockit</groupId>
+			<artifactId>jmockit</artifactId>
+			<version>${jmock-version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/micrometer/AbstractMicrometerTest.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/micrometer/AbstractMicrometerTest.java
index 9e02efaa..9af009ef 100644
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/micrometer/AbstractMicrometerTest.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/micrometer/AbstractMicrometerTest.java
@@ -18,13 +18,16 @@ package org.springframework.cloud.task.micrometer;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.simple.SimpleConfig;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import io.pivotal.cfenv.test.CfEnvTestUtils;
+import mockit.Mock;
+import mockit.MockUp;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -80,7 +83,31 @@ public class AbstractMicrometerTest {
 		String serviceJson = StreamUtils.copyToString(new DefaultResourceLoader()
 				.getResource("classpath:/micrometer/pcf-scs-info.json").getInputStream(),
 				Charset.forName("UTF-8"));
-		CfEnvTestUtils.mockVcapServicesFromString(serviceJson);
+		mockVcapServicesFromString(serviceJson);
+	}
+
+	public static MockUp<?> mockVcapServicesFromString(String serviceJson) {
+		final Map<String, String> env = System.getenv();
+		return new MockUp<System>() {
+			@Mock
+			public String getenv(String name) {
+				if (name.equalsIgnoreCase("VCAP_SERVICES")) {
+					return serviceJson;
+				}
+				else {
+					return name.equalsIgnoreCase("VCAP_APPLICATION")
+							? "{\"instance_id\":\"123\"}" : (String) env.get(name);
+				}
+			}
+
+			@Mock
+			public Map getenv() {
+				Map<String, String> finalMap = new HashMap();
+				finalMap.putAll(env);
+				finalMap.put("VCAP_SERVICES", serviceJson);
+				return finalMap;
+			}
+		};
 	}
 
 	@SpringBootApplication
diff --git a/spring-cloud-task-dependencies/pom.xml b/spring-cloud-task-dependencies/pom.xml
index 3ed9a4a7..d6b9e731 100644
--- a/spring-cloud-task-dependencies/pom.xml
+++ b/spring-cloud-task-dependencies/pom.xml
@@ -14,10 +14,6 @@
 		<relativePath />
 	</parent>
 
-	<properties>
-		<java-cfenv-boot.version>2.1.0.RELEASE</java-cfenv-boot.version>
-	</properties>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -40,11 +36,6 @@
 				<artifactId>spring-cloud-task-stream</artifactId>
 				<version>2.3.0-SNAPSHOT</version>
 			</dependency>
-			<dependency>
-				<groupId>io.pivotal.cfenv</groupId>
-				<artifactId>java-cfenv-test-support</artifactId>
-				<version>${java-cfenv-boot.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>