From f1fb334fed30ae4f7bddd6dfb83bfacae51669a9 Mon Sep 17 00:00:00 2001 From: Florian Ruschbaschan <46709526+floruschbaschan@users.noreply.github.com> Date: Thu, 20 May 2021 11:00:25 +0200 Subject: [PATCH] Fix test name in order to get executed by surefire (#1117) * Fix test name in order to get executed by surefire Signed-off-by: Florian Ruschbaschan * Fix expected group amount for outer query Signed-off-by: Florian Ruschbaschan --- ...acleTest.java => RSQLParserValidationOracleTest.java} | 2 +- ...utGroupFields.java => RSQLRolloutGroupFieldTest.java} | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/{RsqlParserValidationOracleTest.java => RSQLParserValidationOracleTest.java} (98%) rename hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/{RSQLRolloutGroupFields.java => RSQLRolloutGroupFieldTest.java} (94%) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java similarity index 98% rename from hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java rename to hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java index f4d602017..fa7554e5d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java @@ -27,7 +27,7 @@ import io.qameta.allure.Story; @Feature("Component Tests - Repository") @Story("RSQL filter suggestion") -public class RsqlParserValidationOracleTest extends AbstractJpaIntegrationTest { +public class RSQLParserValidationOracleTest extends AbstractJpaIntegrationTest { @Autowired private RsqlValidationOracle rsqlValidationOracle; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java similarity index 94% rename from hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java rename to hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java index 670b42bf2..8e203fe76 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java @@ -29,7 +29,7 @@ import io.qameta.allure.Story; @Feature("Component Tests - Repository") @Story("RSQL filter rollout group") -public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { +public class RSQLRolloutGroupFieldTest extends AbstractJpaIntegrationTest { private Long rolloutGroupId; private Rollout rollout; @@ -48,7 +48,6 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { @Test @Description("Test filter rollout group by id") public void testFilterByParameterId() { - assertRSQLQuery(RolloutGroupFields.ID.name() + "==*", 3); assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + rolloutGroupId, 1); assertRSQLQuery(RolloutGroupFields.ID.name() + "!=" + rolloutGroupId, 3); assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + -1, 0); @@ -62,7 +61,7 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { assertRSQLQuery(RolloutGroupFields.ID.name() + "==*", 4); assertRSQLQuery(RolloutGroupFields.ID.name() + "==noexist*", 0); assertRSQLQuery(RolloutGroupFields.ID.name() + "=in=(" + rolloutGroupId + ",10000000)", 1); - assertRSQLQuery(RolloutGroupFields.ID.name() + "=out=(" + rolloutGroupId + ",10000000)", 2); + assertRSQLQuery(RolloutGroupFields.ID.name() + "=out=(" + rolloutGroupId + ",10000000)", 3); } @Test @@ -87,12 +86,12 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { assertRSQLQuery(RolloutGroupFields.DESCRIPTION.name() + "=out=(group-1,notexist)", 3); } - private void assertRSQLQuery(final String rsqlParam, final long expcetedTargets) { + private void assertRSQLQuery(final String rsqlParam, final long expectedTargets) { final Page findTargetPage = rolloutGroupManagement.findByRolloutAndRsql(PageRequest.of(0, 100), rollout.getId(), rsqlParam); final long countTargetsAll = findTargetPage.getTotalElements(); assertThat(findTargetPage).isNotNull(); - assertThat(countTargetsAll).isEqualTo(expcetedTargets); + assertThat(countTargetsAll).isEqualTo(expectedTargets); } private Rollout createRollout(final String name, final int amountGroups, final long distributionSetId,