Skip to content

Commit 5ef4770

Browse files
committed
update tests
1 parent be1306d commit 5ef4770

13 files changed

Lines changed: 19 additions & 6100 deletions

File tree

flink-sql-runner/src/test/java/com/datasqrl/flinkrunner/AbstractITSupport.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.testcontainers.junit.jupiter.Testcontainers;
4646
import org.testcontainers.postgresql.PostgreSQLContainer;
4747
import org.testcontainers.utility.DockerImageName;
48-
import org.testcontainers.utility.MountableFile;
4948

5049
@Slf4j
5150
@Testcontainers
@@ -60,15 +59,12 @@ public class AbstractITSupport {
6059

6160
@Container
6261
protected static final GenericContainer<?> postgresContainer =
63-
new PostgreSQLContainer(DockerImageName.parse("postgres:17"))
62+
new PostgreSQLContainer(DockerImageName.parse("postgres:18"))
6463
.withNetwork(sharedNetwork)
6564
.withNetworkAliases("postgres")
6665
.withDatabaseName("datasqrl")
6766
.withUsername("postgres")
68-
.withPassword("postgres")
69-
.withCopyFileToContainer(
70-
MountableFile.forClasspathResource("sqrl/postgres-schema.sql"),
71-
"/docker-entrypoint-initdb.d/init.sql");
67+
.withPassword("postgres");
7268

7369
@Container
7470
protected static final GenericContainer<?> redpandaContainer =

flink-sql-runner/src/test/java/com/datasqrl/flinkrunner/SqlUtilsTest.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,29 @@
1919

2020
import com.google.common.base.Charsets;
2121
import com.google.common.io.Resources;
22+
import java.util.stream.Stream;
2223
import org.junit.jupiter.params.ParameterizedTest;
23-
import org.junit.jupiter.params.provider.CsvSource;
24+
import org.junit.jupiter.params.provider.Arguments;
25+
import org.junit.jupiter.params.provider.MethodSource;
2426

2527
class SqlUtilsTest {
2628

29+
static Stream<Arguments> testArgs() {
30+
return Stream.of(
31+
Arguments.of("flink.sql", 12),
32+
Arguments.of("test_sql.sql", 6),
33+
Arguments.of("test_udf_sql.sql", 6));
34+
}
35+
2736
@ParameterizedTest(name = "{0}")
28-
@CsvSource({"flink.sql,18", "test_sql.sql,6", "test_udf_sql.sql,6"})
37+
@MethodSource("testArgs")
2938
void givenSource_when_thenSplitCorrectly(String filename, int numberOfStatements)
3039
throws Exception {
31-
var script = Resources.toString(getClass().getResource("/sql/" + filename), Charsets.UTF_8);
40+
41+
var scriptUrl = getClass().getResource("/sql/" + filename);
42+
assertThat(scriptUrl).isNotNull();
43+
44+
var script = Resources.toString(scriptUrl, Charsets.UTF_8);
3245
var stmts = SqlUtils.parseStatements(script);
3346
assertThat(stmts).isNotNull().isNotEmpty().hasSize(numberOfStatements);
3447
}

flink-sql-runner/src/test/resources/datasources/cardAssignment.jsonl

Lines changed: 0 additions & 13 deletions
This file was deleted.

flink-sql-runner/src/test/resources/datasources/merchant.jsonl

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)