Skip to content

Commit c1d57b0

Browse files
GoodforGodGoodforGod
committed
Fixed tests config
1 parent 5125e6a commit c1d57b0

File tree

9 files changed

+58
-24
lines changed

9 files changed

+58
-24
lines changed

‎database/database-cassandra/src/test/java/ru/tinkoff/kora/database/cassandra/CassandraDatabaseTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package ru.tinkoff.kora.database.cassandra;
22

33
import org.assertj.core.api.Assertions;
4+
import org.jetbrains.annotations.Nullable;
45
import org.junit.jupiter.api.Test;
56
import org.junit.jupiter.api.extension.ExtendWith;
67
import ru.tinkoff.kora.database.common.QueryContext;
8+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
9+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
10+
import ru.tinkoff.kora.database.common.telemetry.DatabaseTracingConfig;
711
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
812
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_ConfigValueExtractor;
913
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_LogConfig_ConfigValueExtractor;
@@ -56,9 +60,9 @@ private static CassandraDatabase createCassandraDatabase(CassandraParams params)
5660
params.username(),
5761
params.password()
5862
),
59-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
63+
new $DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl(
64+
new $DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl(false, false),
6065
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
61-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
6266
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
6367
)
6468
);

‎database/database-flyway/src/test/java/ru/tinkoff/kora/database/flyway/FlywayJdbcDatabaseInterceptorTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import org.junit.jupiter.api.extension.ExtendWith;
6+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
7+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
68
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
79
import ru.tinkoff.kora.database.jdbc.$JdbcDatabaseConfig_ConfigValueExtractor;
810
import ru.tinkoff.kora.database.jdbc.JdbcDatabase;
@@ -39,9 +41,9 @@ public void testFlywayInterceptor(PostgresParams params) throws SQLException {
3941
Duration.ofMillis(1000L),
4042
false,
4143
new Properties(),
42-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
44+
new $DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl(
45+
new $DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl(false, false),
4346
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
44-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
4547
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
4648
)
4749
);

‎database/database-jdbc/src/test/java/ru/tinkoff/kora/database/jdbc/JdbcDatabaseTest.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
import org.junit.jupiter.api.Test;
77
import org.junit.jupiter.api.extension.ExtendWith;
88
import org.slf4j.LoggerFactory;
9+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
10+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl;
11+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
12+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl;
913
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
1014
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_ConfigValueExtractor;
1115
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_LogConfig_ConfigValueExtractor;
16+
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl;
1217
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_MetricsConfig_ConfigValueExtractor;
18+
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl;
1319
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_TracingConfig_ConfigValueExtractor;
1420
import ru.tinkoff.kora.test.postgres.PostgresParams;
1521
import ru.tinkoff.kora.test.postgres.PostgresTestContainer;
@@ -50,10 +56,10 @@ private static void withDb(PostgresParams params, Consumer<JdbcDatabase> consume
5056
Duration.ofMillis(1000L),
5157
false,
5258
new Properties(),
53-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
54-
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
55-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
56-
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
59+
new DatabaseTelemetryConfig_Impl(
60+
new DatabaseTracingConfig_Impl(true, false),
61+
new LogConfig_Impl(true),
62+
new MetricsConfig_Impl(null, null)
5763
)
5864
);
5965
var db = new JdbcDatabase(config, new DefaultDataBaseTelemetryFactory(null, null, null));

‎database/database-jdbc/src/test/kotlin/ru/tinkoff/kora/database/jdbc/SuspendJdbcDatabaseTest.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ import org.junit.jupiter.api.Test
99
import org.junit.jupiter.api.extension.ExtendWith
1010
import org.slf4j.LoggerFactory
1111
import ru.tinkoff.kora.common.Context
12+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTelemetryConfig_ConfigValueExtractor`
13+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTelemetryConfig_ConfigValueExtractor`.DatabaseTelemetryConfig_Impl
14+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTracingConfig_ConfigValueExtractor`
15+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTracingConfig_ConfigValueExtractor`.DatabaseTracingConfig_Impl
1216
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory
1317
import ru.tinkoff.kora.database.jdbc.`$JdbcDatabaseConfig_ConfigValueExtractor`.*
1418
import ru.tinkoff.kora.database.jdbc.JdbcHelper.SqlRunnable
@@ -161,9 +165,9 @@ internal class SuspendJdbcDatabaseTest {
161165
Duration.ofMillis(1000L),
162166
false,
163167
Properties(),
164-
TelemetryConfig_Impl(
168+
DatabaseTelemetryConfig_Impl(
169+
DatabaseTracingConfig_Impl(true, false),
165170
LogConfig_Impl(true),
166-
TracingConfig_Impl(true),
167171
MetricsConfig_Impl(null, null)
168172
)
169173
)

‎database/database-liquibase/src/test/java/ru.tinkoff.kora.database.liquibase/LiquibaseJdbcDatabaseInterceptorTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import org.junit.jupiter.api.extension.ExtendWith;
6+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
7+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
68
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
79
import ru.tinkoff.kora.database.jdbc.$JdbcDatabaseConfig_ConfigValueExtractor;
810
import ru.tinkoff.kora.database.jdbc.JdbcDatabase;
@@ -39,9 +41,9 @@ public void testLiquibaseInterceptor(PostgresParams params) throws SQLException
3941
Duration.ofMillis(1000L),
4042
false,
4143
new Properties(),
42-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
44+
new $DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl(
45+
new $DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl(false, false),
4346
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
44-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
4547
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
4648
)
4749
);

‎database/database-r2dbc/src/test/java/ru/tinkoff/kora/database/r2dbc/R2dbcDatabaseTest.java‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
import org.junit.jupiter.api.extension.ExtendWith;
66
import reactor.test.StepVerifier;
77
import ru.tinkoff.kora.database.common.QueryContext;
8+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
9+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl;
10+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
11+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl;
812
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
913
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_ConfigValueExtractor;
1014
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_LogConfig_ConfigValueExtractor;
15+
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl;
1116
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_MetricsConfig_ConfigValueExtractor;
17+
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl;
1218
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_TracingConfig_ConfigValueExtractor;
1319
import ru.tinkoff.kora.test.postgres.PostgresParams;
1420
import ru.tinkoff.kora.test.postgres.PostgresTestContainer;
@@ -41,10 +47,10 @@ private static void withDb(PostgresParams params, Consumer<R2dbcDatabase> consum
4147
0,
4248
false,
4349
Collections.emptyMap(),
44-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
45-
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
46-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
47-
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
50+
new DatabaseTelemetryConfig_Impl(
51+
new DatabaseTracingConfig_Impl(true, false),
52+
new LogConfig_Impl(true),
53+
new MetricsConfig_Impl(null, null)
4854
)
4955
);
5056
var db = new R2dbcDatabase(config, List.of(), new DefaultDataBaseTelemetryFactory(null, null, null));

‎database/database-r2dbc/src/test/kotlin/ru/tinkoff/kora/database/r2dbc/R2dbcDatabaseExtensionTest.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import org.junit.jupiter.api.Test
99
import org.junit.jupiter.api.extension.ExtendWith
1010
import org.junit.jupiter.api.fail
1111
import ru.tinkoff.kora.common.Context
12+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTelemetryConfig_ConfigValueExtractor`
13+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTelemetryConfig_ConfigValueExtractor`.DatabaseTelemetryConfig_Impl
14+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTracingConfig_ConfigValueExtractor`.DatabaseTracingConfig_Impl
1215
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory
1316
import ru.tinkoff.kora.database.r2dbc.`$R2dbcDatabaseConfig_ConfigValueExtractor`.R2dbcDatabaseConfig_Impl
1417
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_ConfigValueExtractor`.TelemetryConfig_Impl
@@ -109,9 +112,9 @@ class R2dbcDatabaseExtensionTest {
109112
0,
110113
false,
111114
mapOf<String, String>(),
112-
TelemetryConfig_Impl(
115+
DatabaseTelemetryConfig_Impl(
116+
DatabaseTracingConfig_Impl(true, false),
113117
LogConfig_Impl(true),
114-
TracingConfig_Impl(true),
115118
MetricsConfig_Impl(null, null)
116119
)
117120
)

‎database/database-symbol-processor/src/test/kotlin/ru/tinkoff/kora/database/symbol/processor/jdbc/JdbcParametersTest.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ import org.mockito.ArgumentMatchers
66
import org.mockito.Mockito
77
import org.mockito.kotlin.verify
88
import ru.tinkoff.kora.common.Tag
9+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTelemetryConfig_ConfigValueExtractor`.DatabaseTelemetryConfig_Impl
10+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTracingConfig_ConfigValueExtractor`
11+
import ru.tinkoff.kora.database.common.telemetry.`$DatabaseTracingConfig_ConfigValueExtractor`.DatabaseTracingConfig_Impl
912
import ru.tinkoff.kora.database.jdbc.`$JdbcDatabaseConfig_ConfigValueExtractor`.JdbcDatabaseConfig_Impl
1013
import ru.tinkoff.kora.database.jdbc.mapper.parameter.JdbcParameterColumnMapper
1114
import ru.tinkoff.kora.database.symbol.processor.entity.TestEntity
1215
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_ConfigValueExtractor`
1316
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_LogConfig_ConfigValueExtractor`
17+
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_LogConfig_ConfigValueExtractor`.LogConfig_Impl
1418
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_MetricsConfig_ConfigValueExtractor`
19+
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_MetricsConfig_ConfigValueExtractor`.MetricsConfig_Impl
1520
import ru.tinkoff.kora.telemetry.common.`$TelemetryConfig_TracingConfig_ConfigValueExtractor`
1621
import java.time.Duration
1722
import java.util.*
@@ -54,10 +59,10 @@ class JdbcParametersTest : AbstractJdbcRepositoryTest() {
5459
Duration.ofMillis(1000L),
5560
false,
5661
Properties(),
57-
`$TelemetryConfig_ConfigValueExtractor`.TelemetryConfig_Impl(
58-
`$TelemetryConfig_LogConfig_ConfigValueExtractor`.LogConfig_Impl(true),
59-
`$TelemetryConfig_TracingConfig_ConfigValueExtractor`.TracingConfig_Impl(true),
60-
`$TelemetryConfig_MetricsConfig_ConfigValueExtractor`.MetricsConfig_Impl(null, null)
62+
DatabaseTelemetryConfig_Impl(
63+
DatabaseTracingConfig_Impl(true, false),
64+
LogConfig_Impl(true),
65+
MetricsConfig_Impl(null, null)
6166
)
6267
)
6368
val repository = compileForArgs(

‎database/database-vertx/src/test/java/ru/tinkoff/kora/database/vertx/VertxConnectionFactoryTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.junit.jupiter.api.Test;
1414
import org.junit.jupiter.api.extension.ExtendWith;
1515
import ru.tinkoff.kora.database.common.QueryContext;
16+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTelemetryConfig_ConfigValueExtractor;
17+
import ru.tinkoff.kora.database.common.telemetry.$DatabaseTracingConfig_ConfigValueExtractor;
1618
import ru.tinkoff.kora.database.common.telemetry.DefaultDataBaseTelemetryFactory;
1719
import ru.tinkoff.kora.netty.common.NettyChannelFactory;
1820
import ru.tinkoff.kora.telemetry.common.$TelemetryConfig_ConfigValueExtractor;
@@ -71,9 +73,9 @@ private static void withDb(PostgresParams params, Consumer<VertxDatabase> consum
7173
true,
7274
false,
7375
Duration.ofMillis(1000),
74-
new $TelemetryConfig_ConfigValueExtractor.TelemetryConfig_Impl(
76+
new $DatabaseTelemetryConfig_ConfigValueExtractor.DatabaseTelemetryConfig_Impl(
77+
new $DatabaseTracingConfig_ConfigValueExtractor.DatabaseTracingConfig_Impl(false, false),
7578
new $TelemetryConfig_LogConfig_ConfigValueExtractor.LogConfig_Impl(true),
76-
new $TelemetryConfig_TracingConfig_ConfigValueExtractor.TracingConfig_Impl(true),
7779
new $TelemetryConfig_MetricsConfig_ConfigValueExtractor.MetricsConfig_Impl(null, null)
7880
)
7981
);

0 commit comments

Comments
 (0)