From be1d8056a59c1a02d58710fd4a61662959eb9319 Mon Sep 17 00:00:00 2001 From: Matthew Wells Date: Thu, 20 Jul 2023 13:59:22 -0700 Subject: [PATCH] moved invalid failure tests to a different folder and made them work Signed-off-by: Matthew Wells --- .../sql/sql/DateTimeFunctionIT.java | 30 +++++++++++++++++++ .../sql/sql/antlr/BracketedTimestampTest.java | 30 ------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java index a969aa0bf6..4b9019a484 100644 --- a/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java +++ b/integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java @@ -1357,4 +1357,34 @@ public void testBracketedEquivalent() throws IOException { compareBrackets("time", "time", "17:30:00"); compareBrackets("time", "t", "17:30:00"); } + + private void queryFails(String query) { + Request request = new Request("POST", QUERY_API_ENDPOINT); + request.setJsonEntity(String.format(Locale.ROOT, "{\n" + " \"query\": \"%s\"\n" + "}", query)); + + RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder(); + restOptionsBuilder.addHeader("Content-Type", "application/json"); + request.setOptions(restOptionsBuilder); + + boolean fails = false; + + try { + client().performRequest(request); + } catch(Exception ignored) { + fails = true; + } + + assertTrue(fails); + } + + @Test + public void testBracketFails() { + queryFails("select {time 'failure'}"); + queryFails("select {t 'failure'}"); + queryFails("select {date 'failure'}"); + queryFails("select {d 'failure'}"); + queryFails("select {timestamp 'failure'}"); + queryFails("select {ts 'failure'}"); + + } } diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java index a2d56d396d..992fc2862e 100644 --- a/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java +++ b/sql/src/test/java/org/opensearch/sql/sql/antlr/BracketedTimestampTest.java @@ -32,34 +32,4 @@ void timestamp_shortened_test() { void timestamp_test() { acceptQuery("SELECT {timestamp '2001-05-07 10:11:12'}"); } - - @Test - void invalid_time_test() { - rejectQuery("SELECT {time '2001-05-07'}"); - } - - @Test - void invalid_t_test() { - rejectQuery("SELECT {t '2001-05-07'}"); - } - - @Test - void invalid_date_test() { - rejectQuery("SELECT {date '10:11:12'}"); - } - - @Test - void invalid_d_test() { - rejectQuery("SELECT {d '10:11:12'}"); - } - - @Test - void invalid_timestamp_test() { - rejectQuery("SELECT {timestamp 'invalid'}"); - } - - @Test - void invalid_ts_test() { - rejectQuery("SELECT {ts 'invalid'}"); - } }