afedulov commented on code in PR #19660:
URL: https://github.com/apache/flink/pull/19660#discussion_r869513703
##########
flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/IndexGeneratorFactoryTest.java:
##########
@@ -218,76 +219,67 @@ public void
testDynamicIndexDefaultFormatTimestampWithLocalTimeZoneWithSpecificT
IndexGeneratorFactory.createIndexGenerator(
"my-index-{local_timestamp|}", schema,
ZoneId.of("Europe/Berlin"));
indexGenerator.open();
- Assert.assertEquals(
- "my-index-2020_03_17_20_12_14+01",
indexGenerator.generate(rows.get(0)));
- Assert.assertEquals(
- "my-index-2020_03_20_04_22_14+01",
indexGenerator.generate(rows.get(1)));
+ assertThat(indexGenerator.generate(rows.get(0)))
+ .isEqualTo("my-index-2020_03_17_20_12_14+01");
+ assertThat(indexGenerator.generate(rows.get(1)))
+ .isEqualTo("my-index-2020_03_20_04_22_14+01");
}
@Test
public void testGeneralDynamicIndex() {
IndexGenerator indexGenerator =
IndexGeneratorFactory.createIndexGenerator("index_{item}",
schema);
indexGenerator.open();
- Assert.assertEquals("index_apple",
indexGenerator.generate(rows.get(0)));
- Assert.assertEquals("index_peanut",
indexGenerator.generate(rows.get(1)));
+
assertThat(indexGenerator.generate(rows.get(0))).isEqualTo("index_apple");
+
assertThat(indexGenerator.generate(rows.get(1))).isEqualTo("index_peanut");
}
@Test
public void testStaticIndex() {
IndexGenerator indexGenerator =
IndexGeneratorFactory.createIndexGenerator("my-index", schema);
indexGenerator.open();
- Assert.assertEquals("my-index", indexGenerator.generate(rows.get(0)));
- Assert.assertEquals("my-index", indexGenerator.generate(rows.get(1)));
+ assertThat(indexGenerator.generate(rows.get(0))).isEqualTo("my-index");
+ assertThat(indexGenerator.generate(rows.get(1))).isEqualTo("my-index");
}
@Test
public void testUnknownField() {
String expectedExceptionMsg =
"Unknown field 'unknown_ts' in index pattern
'my-index-{unknown_ts|yyyy-MM-dd}',"
+ " please check the field name.";
- try {
-
IndexGeneratorFactory.createIndexGenerator("my-index-{unknown_ts|yyyy-MM-dd}",
schema);
- } catch (TableException e) {
- Assert.assertEquals(e.getMessage(), expectedExceptionMsg);
- }
+ assertThatThrownBy(
+ () ->
+ IndexGeneratorFactory.createIndexGenerator(
+ "my-index-{unknown_ts|yyyy-MM-dd}",
schema))
+ .isInstanceOf(TableException.class)
+ .hasMessage(expectedExceptionMsg);
}
@Test
public void testUnsupportedTimeType() {
String expectedExceptionMsg =
"Unsupported type 'INT' found in Elasticsearch dynamic index
field, "
+ "time-related pattern only support types are:
DATE,TIME,TIMESTAMP.";
- try {
-
IndexGeneratorFactory.createIndexGenerator("my-index-{id|yyyy-MM-dd}", schema);
- } catch (TableException e) {
- Assert.assertEquals(expectedExceptionMsg, e.getMessage());
- }
+ assertThatThrownBy(
+ () ->
+ IndexGeneratorFactory.createIndexGenerator(
+ "my-index-{id|yyyy-MM-dd}", schema))
+ .isInstanceOf(TableException.class)
+ .hasMessage(expectedExceptionMsg);
}
@Test
public void testUnsupportedMultiParametersType() {
String expectedExceptionMsg =
"Chaining dynamic index pattern
my-index-{local_date}-{local_time} is not supported,"
+ " only support single dynamic index pattern.";
- try {
- IndexGeneratorFactory.createIndexGenerator(
- "my-index-{local_date}-{local_time}", schema);
- } catch (TableException e) {
- Assert.assertEquals(expectedExceptionMsg, e.getMessage());
- }
- }
-
- @Test
- public void testDynamicIndexUnsupportedFormat() {
Review Comment:
This test also got deleted.
##########
flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/table/IndexGeneratorTest.java:
##########
@@ -299,67 +300,58 @@ public void testGeneralDynamicIndex() {
IndexGenerator indexGenerator =
IndexGeneratorFactory.createIndexGenerator("index_{item}",
fieldNames, dataTypes);
indexGenerator.open();
- Assertions.assertEquals("index_apple",
indexGenerator.generate(rows.get(0)));
- Assertions.assertEquals("index_peanut",
indexGenerator.generate(rows.get(1)));
+
assertThat(indexGenerator.generate(rows.get(0))).isEqualTo("index_apple");
+
assertThat(indexGenerator.generate(rows.get(1))).isEqualTo("index_peanut");
}
@Test
public void testStaticIndex() {
IndexGenerator indexGenerator =
IndexGeneratorFactory.createIndexGenerator("my-index",
fieldNames, dataTypes);
indexGenerator.open();
- Assertions.assertEquals("my-index",
indexGenerator.generate(rows.get(0)));
- Assertions.assertEquals("my-index",
indexGenerator.generate(rows.get(1)));
+ assertThat(indexGenerator.generate(rows.get(0))).isEqualTo("my-index");
+ assertThat(indexGenerator.generate(rows.get(1))).isEqualTo("my-index");
}
@Test
public void testUnknownField() {
String expectedExceptionMsg =
"Unknown field 'unknown_ts' in index pattern
'my-index-{unknown_ts|yyyy-MM-dd}',"
+ " please check the field name.";
- try {
- IndexGeneratorFactory.createIndexGenerator(
- "my-index-{unknown_ts|yyyy-MM-dd}", fieldNames, dataTypes);
- } catch (TableException e) {
- Assertions.assertEquals(e.getMessage(), expectedExceptionMsg);
- }
+ assertThatThrownBy(
+ () ->
+ IndexGeneratorFactory.createIndexGenerator(
+ "my-index-{unknown_ts|yyyy-MM-dd}",
fieldNames, dataTypes))
+ .isInstanceOf(TableException.class)
+ .hasMessage(expectedExceptionMsg);
}
@Test
public void testUnsupportedTimeType() {
String expectedExceptionMsg =
"Unsupported type 'INT' found in Elasticsearch dynamic index
field, "
+ "time-related pattern only support types are:
DATE,TIME,TIMESTAMP.";
- try {
- IndexGeneratorFactory.createIndexGenerator(
- "my-index-{id|yyyy-MM-dd}", fieldNames, dataTypes);
- } catch (TableException e) {
- Assertions.assertEquals(expectedExceptionMsg, e.getMessage());
- }
+ assertThatThrownBy(
+ () ->
+ IndexGeneratorFactory.createIndexGenerator(
+ "my-index-{id|yyyy-MM-dd}",
fieldNames, dataTypes))
+ .isInstanceOf(TableException.class)
+ .hasMessage(expectedExceptionMsg);
}
@Test
public void testUnsupportedMultiParametersType() {
String expectedExceptionMsg =
"Chaining dynamic index pattern
my-index-{local_date}-{local_time} is not supported,"
+ " only support single dynamic index pattern.";
- try {
- IndexGeneratorFactory.createIndexGenerator(
- "my-index-{local_date}-{local_time}", fieldNames,
dataTypes);
- } catch (TableException e) {
- Assertions.assertEquals(expectedExceptionMsg, e.getMessage());
- }
- }
-
- @Test
- public void testDynamicIndexUnsupportedFormat() {
Review Comment:
This test got removed. Is that intentional?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
