Skip to content

Migrate tests to JUnit #19808

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

Merged
martint merged 3 commits into from
Nov 20, 2023
Merged

Migrate tests to JUnit #19808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e76631a
Remove unused methods
martint Nov 17, 2023
486657e
Migrate to AssertJ
martint Nov 17, 2023
1ca7bb4
Migrate tests to JUnit
martint Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions client/trino-cli/src/test/java/io/trino/cli/TestAlignedTablePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toMap;
import static org.testng.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

public class TestAlignedTablePrinter
{
Expand Down Expand Up @@ -70,7 +70,7 @@ public void testAlignedPrinting()
" bye | done | -15 \n" +
"(5 rows)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -93,7 +93,7 @@ public void testHexPrintingInLists()
" [68 65 6c 6c 6f] \n" +
"(1 row)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -116,7 +116,7 @@ public void testHexPrintingInMaps()
" {key2=68 65 6c 6c 6f, key=68 65 6c 6c 6f} \n" +
"(1 row)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -139,7 +139,7 @@ public void testHexPrintingInMapKeys()
" {68 65 6c 6c 6f=world} \n" +
"(1 row)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -162,7 +162,7 @@ public void testHexPrintingInNestedStructures()
" {key2={nested=68 65 6c 6c 6f}, key=[68 65 6c 6c 6f, NULL]} \n" +
"(1 row)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -186,7 +186,7 @@ public void testAlignedPrintingOneRow()
" without wrapping | \n" +
"(1 row)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand All @@ -207,7 +207,7 @@ public void testAlignedPrintingNoRows()
"-------+------\n" +
"(0 rows)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand Down Expand Up @@ -239,7 +239,7 @@ public void testAlignedPrintingHex()
" cat | | dog \n" +
"(3 rows)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand Down Expand Up @@ -272,7 +272,7 @@ public void testAlignedPrintingWideCharacters()
" bye | done | -15 \n" +
"(3 rows)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

static Column column(String name, String type)
Expand Down
6 changes: 3 additions & 3 deletions client/trino-cli/src/test/java/io/trino/cli/TestAutoTablePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import static io.trino.client.ClientStandardTypes.BIGINT;
import static io.trino.client.ClientStandardTypes.VARCHAR;
import static java.util.Arrays.asList;
import static org.testng.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

public class TestAutoTablePrinter
{
Expand Down Expand Up @@ -57,7 +57,7 @@ public void testNarrowPrinting()
" bye | done | -15 \n" +
"(4 rows)\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

@Test
Expand Down Expand Up @@ -93,7 +93,7 @@ public void testWidePrinting()
"last | done\n" +
"quantity | -15\n";

assertEquals(writer.getBuffer().toString(), expected);
assertThat(writer.getBuffer().toString()).isEqualTo(expected);
}

static Column column(String name, String type)
Expand Down
71 changes: 35 additions & 36 deletions client/trino-cli/src/test/java/io/trino/cli/TestClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@

import static io.trino.cli.Trino.createCommandLine;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

public class TestClientOptions
{
Expand All @@ -40,94 +39,94 @@ public void testDefaults()
{
Console console = createConsole();
ClientOptions options = console.clientOptions;
assertEquals(options.krb5ServicePrincipalPattern, Optional.of("${SERVICE}@${HOST}"));
assertThat(options.krb5ServicePrincipalPattern).isEqualTo(Optional.of("${SERVICE}@${HOST}"));
ClientSession session = options.toClientSession(options.getTrinoUri());
assertEquals(session.getServer().toString(), "http://localhost:8080");
assertEquals(session.getSource(), "trino-cli");
assertEquals(session.getTimeZone(), ZoneId.systemDefault());
assertThat(session.getServer().toString()).isEqualTo("http://localhost:8080");
assertThat(session.getSource()).isEqualTo("trino-cli");
assertThat(session.getTimeZone()).isEqualTo(ZoneId.systemDefault());
}

@Test
public void testSource()
{
Console console = createConsole("--source=test");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getSource(), "test");
assertThat(session.getSource()).isEqualTo("test");
}

@Test
public void testTraceToken()
{
Console console = createConsole("--trace-token", "test token");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getTraceToken(), Optional.of("test token"));
assertThat(session.getTraceToken()).isEqualTo(Optional.of("test token"));
}

@Test
public void testServerHostOnly()
{
Console console = createConsole("--server=test");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:80");
assertThat(session.getServer().toString()).isEqualTo("http://test:80");
}

@Test
public void testServerHostPort()
{
Console console = createConsole("--server=test:8888");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:8888");
assertThat(session.getServer().toString()).isEqualTo("http://test:8888");
}

@Test
public void testServerHttpUri()
{
Console console = createConsole("--server=http://test/foo");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:80");
assertEquals(session.getCatalog(), Optional.of("foo"));
assertThat(session.getServer().toString()).isEqualTo("http://test:80");
assertThat(session.getCatalog()).isEqualTo(Optional.of("foo"));
}

@Test
public void testServerTrinoUri()
{
Console console = createConsole("--server=trino://test/foo");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:80");
assertEquals(session.getCatalog(), Optional.of("foo"));
assertThat(session.getServer().toString()).isEqualTo("http://test:80");
assertThat(session.getCatalog()).isEqualTo(Optional.of("foo"));
}

@Test
public void testServerHttpsUri()
{
Console console = createConsole("--server=https://test/foo");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "https://test:443");
assertEquals(session.getCatalog(), Optional.of("foo"));
assertThat(session.getServer().toString()).isEqualTo("https://test:443");
assertThat(session.getCatalog()).isEqualTo(Optional.of("foo"));
}

@Test
public void testServer443Port()
{
Console console = createConsole("--server=test:443");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "https://test:443");
assertThat(session.getServer().toString()).isEqualTo("https://test:443");
}

@Test
public void testServerHttpsHostPort()
{
Console console = createConsole("--server=https://test:443");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "https://test:443");
assertThat(session.getServer().toString()).isEqualTo("https://test:443");
}

@Test
public void testServerHttpWithPort443()
{
Console console = createConsole("--server=http://test:443");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:443");
assertThat(session.getServer().toString()).isEqualTo("http://test:443");
}

@Test
Expand Down Expand Up @@ -157,7 +156,7 @@ public void testURLHostOnly()
{
Console console = createConsole("test");
ClientSession session = console.clientOptions.toClientSession(console.clientOptions.getTrinoUri());
assertEquals(session.getServer().toString(), "http://test:80");
assertThat(session.getServer().toString()).isEqualTo("http://test:80");
}

@Test
Expand All @@ -167,10 +166,10 @@ public void testURLParams()
Console console = createConsole("trino://server.example:8080/my-catalog/my-schema?source=my-client");
TrinoUri uri = console.clientOptions.getTrinoUri();
ClientSession session = console.clientOptions.toClientSession(uri);
assertEquals(session.getServer().toString(), "http://server.example:8080");
assertEquals(session.getCatalog(), Optional.of("my-catalog"));
assertEquals(session.getSchema(), Optional.of("my-schema"));
assertEquals(uri.getSource(), Optional.of("my-client"));
assertThat(session.getServer().toString()).isEqualTo("http://server.example:8080");
assertThat(session.getCatalog()).isEqualTo(Optional.of("my-catalog"));
assertThat(session.getSchema()).isEqualTo(Optional.of("my-schema"));
assertThat(uri.getSource()).isEqualTo(Optional.of("my-client"));
}

@Test
Expand All @@ -189,31 +188,31 @@ public void testOutputFormat()
{
Console console = createConsole("--output-format=JSON");
ClientOptions options = console.clientOptions;
assertEquals(options.outputFormat, OutputFormat.JSON);
assertThat(options.outputFormat).isEqualTo(OutputFormat.JSON);
}

@Test
public void testSocksProxy()
{
Console console = createConsole("--socks-proxy=abc:123");
ClientOptions options = console.clientOptions;
assertEquals(options.socksProxy, Optional.of(HostAndPort.fromParts("abc", 123)));
assertThat(options.socksProxy).isEqualTo(Optional.of(HostAndPort.fromParts("abc", 123)));
}

@Test
public void testClientRequestTimeout()
{
Console console = createConsole("--client-request-timeout=7s");
ClientOptions options = console.clientOptions;
assertEquals(options.clientRequestTimeout, new Duration(7, SECONDS));
assertThat(options.clientRequestTimeout).isEqualTo(new Duration(7, SECONDS));
}

@Test
public void testResourceEstimates()
{
Console console = createConsole("--resource-estimate", "resource1=1B", "--resource-estimate", "resource2=2.2h");
ClientOptions options = console.clientOptions;
assertEquals(options.resourceEstimates, ImmutableList.of(
assertThat(options.resourceEstimates).isEqualTo(ImmutableList.of(
new ClientResourceEstimate("resource1", "1B"),
new ClientResourceEstimate("resource2", "2.2h")));
}
Expand All @@ -223,7 +222,7 @@ public void testExtraCredentials()
{
Console console = createConsole("--extra-credential", "test.token.foo=foo", "--extra-credential", "test.token.bar=bar");
ClientOptions options = console.clientOptions;
assertEquals(options.extraCredentials, ImmutableList.of(
assertThat(options.extraCredentials).isEqualTo(ImmutableList.of(
new ClientOptions.ClientExtraCredential("test.token.foo", "foo"),
new ClientOptions.ClientExtraCredential("test.token.bar", "bar")));
}
Expand All @@ -234,15 +233,15 @@ public void testSessionProperties()
Console console = createConsole("--session", "system=system-value", "--session", "catalog.name=catalog-property");

ClientOptions options = console.clientOptions;
assertEquals(options.sessionProperties, ImmutableList.of(
assertThat(options.sessionProperties).isEqualTo(ImmutableList.of(
new ClientSessionProperty(Optional.empty(), "system", "system-value"),
new ClientSessionProperty(Optional.of("catalog"), "name", "catalog-property")));

// special characters are allowed in the value
assertEquals(new ClientSessionProperty("foo=bar:=baz"), new ClientSessionProperty(Optional.empty(), "foo", "bar:=baz"));
assertThat(new ClientSessionProperty("foo=bar:=baz")).isEqualTo(new ClientSessionProperty(Optional.empty(), "foo", "bar:=baz"));

// empty values are allowed
assertEquals(new ClientSessionProperty("foo="), new ClientSessionProperty(Optional.empty(), "foo", ""));
assertThat(new ClientSessionProperty("foo=")).isEqualTo(new ClientSessionProperty(Optional.empty(), "foo", ""));
}

@Test
Expand All @@ -251,10 +250,10 @@ public void testTimeZone()
Console console = createConsole("--timezone=Europe/Vilnius");

ClientOptions options = console.clientOptions;
assertEquals(options.timeZone, ZoneId.of("Europe/Vilnius"));
assertThat(options.timeZone).isEqualTo(ZoneId.of("Europe/Vilnius"));

ClientSession session = options.toClientSession(options.getTrinoUri());
assertEquals(session.getTimeZone(), ZoneId.of("Europe/Vilnius"));
assertThat(session.getTimeZone()).isEqualTo(ZoneId.of("Europe/Vilnius"));
}

@Test
Expand All @@ -263,10 +262,10 @@ public void testDisableCompression()
Console console = createConsole("--disable-compression");

ClientOptions options = console.clientOptions;
assertTrue(options.disableCompression);
assertThat(options.disableCompression).isTrue();

ClientSession session = options.toClientSession(options.getTrinoUri());
assertTrue(session.isCompressionDisabled());
assertThat(session.isCompressionDisabled()).isTrue();
}

@Test
Expand Down
Loading