From dc3282c251827bf839066b40b0fe45f0c9dcd14a Mon Sep 17 00:00:00 2001 From: m1a2st Date: Wed, 12 Jun 2024 21:50:33 +0800 Subject: [PATCH 1/3] modify build.gradle file --- build.gradle | 65 ++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 337cb12ebccfa..ef1aa54dd351c 100644 --- a/build.gradle +++ b/build.gradle @@ -441,9 +441,6 @@ subprojects { } } - // Remove the relevant project name once it's converted to JUnit 5 - def shouldUseJUnit5 = !(["runtime"].contains(it.project.name)) - def testLoggingEvents = ["passed", "skipped", "failed"] def testShowStandardStreams = false def testExceptionFormat = 'full' @@ -536,8 +533,7 @@ subprojects { exclude testsToExclude - if (shouldUseJUnit5) - useJUnitPlatform() + useJUnitPlatform() retry { maxRetries = userMaxTestRetries @@ -564,23 +560,18 @@ subprojects { exclude testsToExclude - if (shouldUseJUnit5) { - if (project.name == 'streams') { - useJUnitPlatform { - includeTags "integration" - includeTags "org.apache.kafka.test.IntegrationTest" - // Both engines are needed to run JUnit 4 tests alongside JUnit 5 tests. - // junit-vintage (JUnit 4) can be removed once the JUnit 4 migration is complete. - includeEngines "junit-vintage", "junit-jupiter" - } - } else { - useJUnitPlatform { - includeTags "integration" - } + if (project.name == 'streams') { + useJUnitPlatform { + includeTags "integration" + includeTags "org.apache.kafka.test.IntegrationTest" + // Both engines are needed to run JUnit 4 tests alongside JUnit 5 tests. + // junit-vintage (JUnit 4) can be removed once the JUnit 4 migration is complete. + includeEngines "junit-vintage", "junit-jupiter" } } else { - useJUnit { - includeCategories 'org.apache.kafka.test.IntegrationTest' + useJUnitPlatform { + includeTags "integration" + includeTags 'org.apache.kafka.test.IntegrationTest' } } @@ -607,23 +598,18 @@ subprojects { exclude testsToExclude - if (shouldUseJUnit5) { - if (project.name == 'streams') { - useJUnitPlatform { - excludeTags "integration" - excludeTags "org.apache.kafka.test.IntegrationTest" - // Both engines are needed to run JUnit 4 tests alongside JUnit 5 tests. - // junit-vintage (JUnit 4) can be removed once the JUnit 4 migration is complete. - includeEngines "junit-vintage", "junit-jupiter" - } - } else { - useJUnitPlatform { - excludeTags "integration" - } + if (project.name == 'streams') { + useJUnitPlatform { + excludeTags "integration" + excludeTags "org.apache.kafka.test.IntegrationTest" + // Both engines are needed to run JUnit 4 tests alongside JUnit 5 tests. + // junit-vintage (JUnit 4) can be removed once the JUnit 4 migration is complete. + includeEngines "junit-vintage", "junit-jupiter" } } else { - useJUnit { - excludeCategories 'org.apache.kafka.test.IntegrationTest' + useJUnitPlatform { + excludeTags "integration" + excludeTags 'org.apache.kafka.test.IntegrationTest' } } @@ -3243,10 +3229,13 @@ project(':connect:runtime') { testImplementation project(':storage') testImplementation project(':connect:test-plugins') testImplementation project(':group-coordinator') - - testImplementation libs.junitJupiterApi + + testImplementation libs.junitJupiter testImplementation libs.junitVintageEngine + testImplementation libs.mockitoJunitJupiter testImplementation libs.mockitoCore + testImplementation libs.hamcrest + testImplementation libs.mockitoJunitJupiter testImplementation libs.httpclient testRuntimeOnly libs.slf4jlog4j @@ -3570,4 +3559,4 @@ task aggregatedJavadoc(type: Javadoc, dependsOn: compileJava) { classpath = files(projectsWithJavadoc.collect { it.sourceSets.main.compileClasspath }) includes = projectsWithJavadoc.collectMany { it.javadoc.getIncludes() } excludes = projectsWithJavadoc.collectMany { it.javadoc.getExcludes() } -} +} \ No newline at end of file From 794d6c926a6a5e06377b238fc4aa76d77f8c8167 Mon Sep 17 00:00:00 2001 From: m1a2st Date: Wed, 12 Jun 2024 21:56:14 +0800 Subject: [PATCH 2/3] add cli policy converter modules: --- .../connect/cli/ConnectStandaloneTest.java | 18 +++++----- ...nnectorClientConfigOverridePolicyTest.java | 19 +++++----- ...nnectorClientConfigOverridePolicyTest.java | 4 +-- ...nnectorClientConfigOverridePolicyTest.java | 4 +-- .../converters/BooleanConverterTest.java | 36 +++++++++---------- .../converters/ByteArrayConverterTest.java | 20 +++++------ .../converters/NumberConverterTest.java | 18 +++++----- 7 files changed, 60 insertions(+), 59 deletions(-) diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java index 9a762f1a394f3..2fb7dfc8fcce5 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.kafka.connect.runtime.rest.entities.CreateConnectorRequest; import org.apache.kafka.test.TestUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileWriter; @@ -30,8 +30,8 @@ import java.util.Properties; import static org.apache.kafka.connect.runtime.ConnectorConfig.NAME_CONFIG; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class ConnectStandaloneTest { @@ -46,7 +46,7 @@ public class ConnectStandaloneTest { private final ConnectStandalone connectStandalone = new ConnectStandalone(); private File connectorConfigurationFile; - @Before + @BeforeEach public void setUp() throws IOException { connectorConfigurationFile = TestUtils.tempFile(); } @@ -81,9 +81,9 @@ public void testParseJsonFileWithConnectorConfiguration() throws Exception { @Test public void testParseJsonFileWithCreateConnectorRequest() throws Exception { CreateConnectorRequest requestToWrite = new CreateConnectorRequest( - CONNECTOR_NAME, - CONNECTOR_CONFIG, - CreateConnectorRequest.InitialState.STOPPED + CONNECTOR_NAME, + CONNECTOR_CONFIG, + CreateConnectorRequest.InitialState.STOPPED ); try (FileWriter writer = new FileWriter(connectorConfigurationFile)) { @@ -124,4 +124,4 @@ public void testParseJsonFileWithCreateConnectorRequestWithUnknownField() throws CreateConnectorRequest expectedRequest = new CreateConnectorRequest(CONNECTOR_NAME, CONNECTOR_CONFIG, null); assertEquals(expectedRequest, parsedRequest); } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java index b6a73d56de9cf..7231ec50a1472 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java @@ -20,11 +20,12 @@ import org.apache.kafka.common.config.ConfigValue; import org.apache.kafka.connect.health.ConnectorType; import org.apache.kafka.connect.runtime.SampleSourceConnector; -import org.junit.Assert; import java.util.List; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertTrue; + public abstract class BaseConnectorClientConfigOverridePolicyTest { protected abstract ConnectorClientConfigOverridePolicy policyToTest(); @@ -41,19 +42,19 @@ protected void testInvalidOverride(Map clientConfig) { private List configValues(Map clientConfig) { ConnectorClientConfigRequest connectorClientConfigRequest = new ConnectorClientConfigRequest( - "test", - ConnectorType.SOURCE, - SampleSourceConnector.class, - clientConfig, - ConnectorClientConfigRequest.ClientType.PRODUCER); + "test", + ConnectorType.SOURCE, + SampleSourceConnector.class, + clientConfig, + ConnectorClientConfigRequest.ClientType.PRODUCER); return policyToTest().validate(connectorClientConfigRequest); } protected void assertNoError(List configValues) { - Assert.assertTrue(configValues.stream().allMatch(configValue -> configValue.errorMessages().isEmpty())); + assertTrue(configValues.stream().allMatch(configValue -> configValue.errorMessages().isEmpty())); } protected void assertError(List configValues) { - Assert.assertTrue(configValues.stream().anyMatch(configValue -> !configValue.errorMessages().isEmpty())); + assertTrue(configValues.stream().anyMatch(configValue -> !configValue.errorMessages().isEmpty())); } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java index 2c7b0789d8022..3bcaac06728c7 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java @@ -19,7 +19,7 @@ import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.config.SaslConfigs; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; @@ -46,4 +46,4 @@ public void testWithOverrides() { protected ConnectorClientConfigOverridePolicy policyToTest() { return noneConnectorClientConfigOverridePolicy; } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java index 0e79c8a6ca990..0ccebd57a935c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java @@ -19,7 +19,7 @@ import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.config.SaslConfigs; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.HashMap; @@ -47,4 +47,4 @@ public void testPrincipalPlusOtherConfigs() { protected ConnectorClientConfigOverridePolicy policyToTest() { return principalConnectorClientConfigOverridePolicy; } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java index d7f9654130c0d..ca31ebfdb0b0d 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java @@ -17,12 +17,12 @@ package org.apache.kafka.connect.converters; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -30,8 +30,8 @@ import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.errors.DataException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class BooleanConverterTest { private static final String TOPIC = "topic"; @@ -39,7 +39,7 @@ public class BooleanConverterTest { private static final byte[] FALSE = new byte[] {0x00}; private final BooleanConverter converter = new BooleanConverter(); - @Before + @BeforeEach public void setUp() { converter.configure(Collections.emptyMap(), false); } @@ -51,20 +51,20 @@ public void testFromConnect() { converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.TRUE) ); assertArrayEquals( - FALSE, - converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.FALSE) + FALSE, + converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.FALSE) ); } @Test public void testFromConnectNullSchema() { assertArrayEquals( - TRUE, - converter.fromConnectData(TOPIC, null, Boolean.TRUE) + TRUE, + converter.fromConnectData(TOPIC, null, Boolean.TRUE) ); assertArrayEquals( - FALSE, - converter.fromConnectData(TOPIC, null, Boolean.FALSE) + FALSE, + converter.fromConnectData(TOPIC, null, Boolean.FALSE) ); } @@ -72,13 +72,13 @@ public void testFromConnectNullSchema() { @Test public void testFromConnectWrongSchema() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, Boolean.FALSE)); + () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, Boolean.FALSE)); } @Test public void testFromConnectInvalidValue() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, "true")); + () -> converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, "true")); } @Test @@ -111,4 +111,4 @@ public void testToConnectInvalidValue() { public void testVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java index 748fd70e63fae..3e5e7377bfe5c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java @@ -21,17 +21,17 @@ import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ByteArrayConverterTest { private static final String TOPIC = "topic"; @@ -39,7 +39,7 @@ public class ByteArrayConverterTest { private final ByteArrayConverter converter = new ByteArrayConverter(); - @Before + @BeforeEach public void setUp() { converter.configure(Collections.emptyMap(), false); } @@ -63,13 +63,13 @@ public void testFromConnectSchemaless() { @Test public void testFromConnectBadSchema() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, SAMPLE_BYTES)); + () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, SAMPLE_BYTES)); } @Test public void testFromConnectInvalidValue() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.BYTES_SCHEMA, 12)); + () -> converter.fromConnectData(TOPIC, Schema.BYTES_SCHEMA, 12)); } @Test @@ -118,4 +118,4 @@ public void testToConnectNull() { public void testVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} +} \ No newline at end of file diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java index f57fd73d458c2..57b5196b7456f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java @@ -21,13 +21,13 @@ import org.apache.kafka.connect.data.Schema; import org.apache.kafka.connect.data.SchemaAndValue; import org.apache.kafka.connect.errors.DataException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public abstract class NumberConverterTest { private static final String TOPIC = "topic"; @@ -46,7 +46,7 @@ public abstract class NumberConverterTest { protected abstract Schema schema(); - @Before + @BeforeEach public void setup() { converter = createConverter(); serializer = createSerializer(); @@ -91,7 +91,7 @@ public void testSerializingIncorrectType() { @Test public void testSerializingIncorrectHeader() { assertThrows(DataException.class, - () -> converter.fromConnectHeader(TOPIC, HEADER_NAME, schema, "not a valid number")); + () -> converter.fromConnectHeader(TOPIC, HEADER_NAME, schema, "not a valid number")); } @Test @@ -110,4 +110,4 @@ public void testBytesNullToNumber() { public void testInheritedVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} +} \ No newline at end of file From 6ab875a23c49af09a3cbd54314d5e09446b33f25 Mon Sep 17 00:00:00 2001 From: m1a2st Date: Wed, 12 Jun 2024 22:01:53 +0800 Subject: [PATCH 3/3] fix format --- build.gradle | 2 +- .../connect/cli/ConnectStandaloneTest.java | 8 ++++---- ...onnectorClientConfigOverridePolicyTest.java | 12 ++++++------ ...onnectorClientConfigOverridePolicyTest.java | 2 +- ...onnectorClientConfigOverridePolicyTest.java | 2 +- .../converters/BooleanConverterTest.java | 18 +++++++++--------- .../converters/ByteArrayConverterTest.java | 6 +++--- .../converters/NumberConverterTest.java | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index ef1aa54dd351c..845a9225ec8a6 100644 --- a/build.gradle +++ b/build.gradle @@ -3559,4 +3559,4 @@ task aggregatedJavadoc(type: Javadoc, dependsOn: compileJava) { classpath = files(projectsWithJavadoc.collect { it.sourceSets.main.compileClasspath }) includes = projectsWithJavadoc.collectMany { it.javadoc.getIncludes() } excludes = projectsWithJavadoc.collectMany { it.javadoc.getExcludes() } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java index 2fb7dfc8fcce5..2821bf431555a 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/cli/ConnectStandaloneTest.java @@ -81,9 +81,9 @@ public void testParseJsonFileWithConnectorConfiguration() throws Exception { @Test public void testParseJsonFileWithCreateConnectorRequest() throws Exception { CreateConnectorRequest requestToWrite = new CreateConnectorRequest( - CONNECTOR_NAME, - CONNECTOR_CONFIG, - CreateConnectorRequest.InitialState.STOPPED + CONNECTOR_NAME, + CONNECTOR_CONFIG, + CreateConnectorRequest.InitialState.STOPPED ); try (FileWriter writer = new FileWriter(connectorConfigurationFile)) { @@ -124,4 +124,4 @@ public void testParseJsonFileWithCreateConnectorRequestWithUnknownField() throws CreateConnectorRequest expectedRequest = new CreateConnectorRequest(CONNECTOR_NAME, CONNECTOR_CONFIG, null); assertEquals(expectedRequest, parsedRequest); } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java index 7231ec50a1472..1845cf090813c 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/BaseConnectorClientConfigOverridePolicyTest.java @@ -42,11 +42,11 @@ protected void testInvalidOverride(Map clientConfig) { private List configValues(Map clientConfig) { ConnectorClientConfigRequest connectorClientConfigRequest = new ConnectorClientConfigRequest( - "test", - ConnectorType.SOURCE, - SampleSourceConnector.class, - clientConfig, - ConnectorClientConfigRequest.ClientType.PRODUCER); + "test", + ConnectorType.SOURCE, + SampleSourceConnector.class, + clientConfig, + ConnectorClientConfigRequest.ClientType.PRODUCER); return policyToTest().validate(connectorClientConfigRequest); } @@ -57,4 +57,4 @@ protected void assertNoError(List configValues) { protected void assertError(List configValues) { assertTrue(configValues.stream().anyMatch(configValue -> !configValue.errorMessages().isEmpty())); } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java index 3bcaac06728c7..63d2a774cb27f 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/NoneConnectorClientConfigOverridePolicyTest.java @@ -46,4 +46,4 @@ public void testWithOverrides() { protected ConnectorClientConfigOverridePolicy policyToTest() { return noneConnectorClientConfigOverridePolicy; } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java index 0ccebd57a935c..03d4d2c940d71 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/connector/policy/PrincipalConnectorClientConfigOverridePolicyTest.java @@ -47,4 +47,4 @@ public void testPrincipalPlusOtherConfigs() { protected ConnectorClientConfigOverridePolicy policyToTest() { return principalConnectorClientConfigOverridePolicy; } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java index ca31ebfdb0b0d..fbdda211e4ecd 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/BooleanConverterTest.java @@ -51,20 +51,20 @@ public void testFromConnect() { converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.TRUE) ); assertArrayEquals( - FALSE, - converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.FALSE) + FALSE, + converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, Boolean.FALSE) ); } @Test public void testFromConnectNullSchema() { assertArrayEquals( - TRUE, - converter.fromConnectData(TOPIC, null, Boolean.TRUE) + TRUE, + converter.fromConnectData(TOPIC, null, Boolean.TRUE) ); assertArrayEquals( - FALSE, - converter.fromConnectData(TOPIC, null, Boolean.FALSE) + FALSE, + converter.fromConnectData(TOPIC, null, Boolean.FALSE) ); } @@ -72,13 +72,13 @@ public void testFromConnectNullSchema() { @Test public void testFromConnectWrongSchema() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, Boolean.FALSE)); + () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, Boolean.FALSE)); } @Test public void testFromConnectInvalidValue() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, "true")); + () -> converter.fromConnectData(TOPIC, Schema.BOOLEAN_SCHEMA, "true")); } @Test @@ -111,4 +111,4 @@ public void testToConnectInvalidValue() { public void testVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java index 3e5e7377bfe5c..b2c572133f714 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/ByteArrayConverterTest.java @@ -63,13 +63,13 @@ public void testFromConnectSchemaless() { @Test public void testFromConnectBadSchema() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, SAMPLE_BYTES)); + () -> converter.fromConnectData(TOPIC, Schema.INT32_SCHEMA, SAMPLE_BYTES)); } @Test public void testFromConnectInvalidValue() { assertThrows(DataException.class, - () -> converter.fromConnectData(TOPIC, Schema.BYTES_SCHEMA, 12)); + () -> converter.fromConnectData(TOPIC, Schema.BYTES_SCHEMA, 12)); } @Test @@ -118,4 +118,4 @@ public void testToConnectNull() { public void testVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} \ No newline at end of file +} diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java index 57b5196b7456f..868ef47bafc1b 100644 --- a/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java +++ b/connect/runtime/src/test/java/org/apache/kafka/connect/converters/NumberConverterTest.java @@ -91,7 +91,7 @@ public void testSerializingIncorrectType() { @Test public void testSerializingIncorrectHeader() { assertThrows(DataException.class, - () -> converter.fromConnectHeader(TOPIC, HEADER_NAME, schema, "not a valid number")); + () -> converter.fromConnectHeader(TOPIC, HEADER_NAME, schema, "not a valid number")); } @Test @@ -110,4 +110,4 @@ public void testBytesNullToNumber() { public void testInheritedVersionRetrievedFromAppInfoParser() { assertEquals(AppInfoParser.getVersion(), converter.version()); } -} \ No newline at end of file +}