From 62e8132fce73ffa4a2d2ecc47a451cc8e4101704 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 17 Jun 2020 09:53:52 +0200 Subject: [PATCH] Polish test --- .../context/catalog/SimpleFunctionRegistryTests.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java index 990216df1..86ad43b40 100644 --- a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java +++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java @@ -24,19 +24,12 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import com.google.gson.Gson; -<<<<<<< HEAD import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -======= import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; ->>>>>>> a97bdcaf... SimpleFunctionRegistryTests: reactive function test case import reactor.core.publisher.Flux; - import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionCatalog;