Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: improve tests #541

Merged
merged 1 commit into from
May 3, 2023
+9 −34
Merged

chore: improve tests #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,6 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
36 changes: 9 additions & 27 deletions spring/src/test/java/com/influxdb/spring/influx/InfluxDB2AutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,19 @@
*/
package com.influxdb.spring.influx;

import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull;

import com.influxdb.client.InfluxDBClient;

import okhttp3.OkHttpClient;
import okhttp3.Protocol;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.ReflectionTestUtils;
import retrofit2.Retrofit;

/**
* Tests for {@link InfluxDB2AutoConfiguration}.
Expand Down Expand Up @@ -69,8 +65,8 @@ public void influxDBClientCanBeCreatedWithoutCredentials() {
this.contextRunner.withPropertyValues("influx.url=http://localhost:8086/")
.run((context) -> {
Assertions.assertThat(context.getBeansOfType(InfluxDBClient.class)).hasSize(1);
int readTimeout = getReadTimeoutProperty(context);
Assertions.assertThat(readTimeout).isEqualTo(10_000);
InfluxDBClient influxDB = context.getBean(InfluxDBClient.class);
Assertions.assertThat(influxDB).extracting("retrofit.callFactory.readTimeoutMillis").isEqualTo(10_000);
});
}

Expand All @@ -81,8 +77,8 @@ public void influxDBClientWithOkHttpClientBuilderProvider() {
.withPropertyValues("influx.url=http://localhost:8086/", "influx.token:token")
.run((context) -> {
Assertions.assertThat(context.getBeansOfType(InfluxDBClient.class)).hasSize(1);
int readTimeout = getReadTimeoutProperty(context);
Assertions.assertThat(readTimeout).isEqualTo(40_000);
InfluxDBClient influxDB = context.getBean(InfluxDBClient.class);
Assertions.assertThat(influxDB).extracting("retrofit.callFactory.readTimeoutMillis").isEqualTo(40_000);
});
}

Expand All @@ -91,34 +87,20 @@ public void influxDBClientWithReadTimeout() {
this.contextRunner.withPropertyValues("influx.url=http://localhost:8086/", "influx.readTimeout=13s")
.run((context) -> {
Assertions.assertThat(context.getBeansOfType(InfluxDBClient.class)).hasSize(1);
int readTimeout = getReadTimeoutProperty(context);
Assertions.assertThat(readTimeout).isEqualTo(13_000);
InfluxDBClient influxDB = context.getBean(InfluxDBClient.class);
Assertions.assertThat(influxDB).extracting("retrofit.callFactory.readTimeoutMillis").isEqualTo(13_000);
});
}

@Test
public void protocolVersion() {
this.contextRunner.withPropertyValues("influx.url=http://localhost:8086/", "spring.influx2.token:token")
.run((context) -> {
List<Protocol> protocols = getOkHttpClient(context).protocols();
Assertions.assertThat(protocols).hasSize(1);
Assertions.assertThat(protocols).contains(Protocol.HTTP_1_1);
InfluxDBClient influxDB = context.getBean(InfluxDBClient.class);
Assertions.assertThat(influxDB).extracting("retrofit.callFactory.protocols", InstanceOfAssertFactories.LIST).contains(Protocol.HTTP_1_1);
});
}

private int getReadTimeoutProperty(AssertableApplicationContext context) {
OkHttpClient callFactory = getOkHttpClient(context);
return callFactory.readTimeoutMillis();
}

@Nonnull
private OkHttpClient getOkHttpClient(final AssertableApplicationContext context) {
InfluxDBClient influxDB = context.getBean(InfluxDBClient.class);
Retrofit retrofit = (Retrofit) ReflectionTestUtils.getField(influxDB, "retrofit");
OkHttpClient callFactory = (OkHttpClient) retrofit.callFactory();
return callFactory;
}

@Configuration
static class CustomOkHttpClientBuilderProviderConfig {

Expand Down