Merge branch '3.5.x' of github.com:freefair/okhttp-spring-boot into 4.0.x

Author: larsgrefer

starters/build.gradle

@@ -6,4 +6,6 @@ subprojects { Project starterProject ->
             attributes 'Spring-Boot-Jar-Type': 'dependencies-starter'
         }
     }
+
+    test.useJUnitPlatform()
 }

starters/okhttp4-spring-boot-starter/build.gradle

@@ -10,4 +10,6 @@ dependencies {
     api project(':okhttp-spring-boot-autoconfigure')
     api project(':okhttp-spring-client')
     api 'com.squareup.okhttp3:okhttp'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

starters/okhttp4-spring-boot-starter/src/test/java/io/freefair/okhttp/starter4/OkHttp4Test.java

@@ -0,0 +1,32 @@
+package io.freefair.okhttp.starter4;
+
+import okhttp3.OkHttpClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+public class OkHttp4Test {
+
+    @Autowired
+    private ConfigurableApplicationContext applicationContext;
+
+    @Test
+    void contextLoads() {
+        assertThat(applicationContext).isNotNull();
+    }
+
+    @Test
+    void hasClientBean() {
+        AssertableApplicationContext context = AssertableApplicationContext.get(() -> applicationContext);
+
+        assertThat(context).hasSingleBean(OkHttpClient.class);
+        OkHttpClient okHttpClient = context.getBean(OkHttpClient.class);
+
+        assertThat(okHttpClient).isNotNull();
+    }
+}

starters/okhttp4-spring-boot-starter/src/test/java/io/freefair/okhttp/starter4/OkHttp4TestApplication.java

@@ -0,0 +1,7 @@
+package io.freefair.okhttp.starter4;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class OkHttp4TestApplication {
+}

starters/okhttp5-spring-boot-starter/build.gradle

@@ -11,4 +11,6 @@ dependencies {
     api project(':okhttp-spring-boot-autoconfigure')
     api project(':okhttp-spring-client')
     api 'com.squareup.okhttp3:okhttp'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

starters/okhttp5-spring-boot-starter/src/test/java/io/freefair/okhttp/starter5/OkHttp5Test.java

@@ -0,0 +1,32 @@
+package io.freefair.okhttp.starter5;
+
+import okhttp3.OkHttpClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+public class OkHttp5Test {
+
+    @Autowired
+    private ConfigurableApplicationContext applicationContext;
+
+    @Test
+    void contextLoads() {
+        assertThat(applicationContext).isNotNull();
+    }
+
+    @Test
+    void hasClientBean() {
+        AssertableApplicationContext context = AssertableApplicationContext.get(() -> applicationContext);
+
+        assertThat(context).hasSingleBean(OkHttpClient.class);
+        OkHttpClient okHttpClient = context.getBean(OkHttpClient.class);
+
+        assertThat(okHttpClient).isNotNull();
+    }
+}

starters/okhttp5-spring-boot-starter/src/test/java/io/freefair/okhttp/starter5/OkHttp5TestApplication.java

@@ -0,0 +1,7 @@
+package io.freefair.okhttp.starter5;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class OkHttp5TestApplication {
+}