lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix test name in order to get executed by surefire (#1117)

Browse Source 
* Fix test name in order to get executed by surefire

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch.io>

* Fix expected group amount for outer query

Signed-off-by: Florian Ruschbaschan <Florian.Ruschbaschan@bosch.io>
This commit is contained in:
Florian Ruschbaschan
2021-05-20 11:00:25 +02:00
committed by GitHub
parent 8f8cfeb53a
commit f1fb334fed
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracleTest.java → hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java
View File

@@ -27,7 +27,7 @@ import io.qameta.allure.Story;
@Feature("Component Tests - Repository") @Feature("Component Tests - Repository")
@Story("RSQL filter suggestion") @Story("RSQL filter suggestion")
public class RsqlParserValidationOracleTest extends AbstractJpaIntegrationTest { public class RSQLParserValidationOracleTest extends AbstractJpaIntegrationTest {
@Autowired @Autowired
private RsqlValidationOracle rsqlValidationOracle; private RsqlValidationOracle rsqlValidationOracle;

9
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFields.java → hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java
View File

@@ -29,7 +29,7 @@ import io.qameta.allure.Story;
@Feature("Component Tests - Repository") @Feature("Component Tests - Repository")
@Story("RSQL filter rollout group") @Story("RSQL filter rollout group")
public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest { public class RSQLRolloutGroupFieldTest extends AbstractJpaIntegrationTest {
private Long rolloutGroupId; private Long rolloutGroupId;
private Rollout rollout; private Rollout rollout;
@@ -48,7 +48,6 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest {
@Test @Test
@Description("Test filter rollout group by id") @Description("Test filter rollout group by id")
public void testFilterByParameterId() { public void testFilterByParameterId() {
assertRSQLQuery(RolloutGroupFields.ID.name() + "==*", 3);
assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + rolloutGroupId, 1); assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + rolloutGroupId, 1);
assertRSQLQuery(RolloutGroupFields.ID.name() + "!=" + rolloutGroupId, 3); assertRSQLQuery(RolloutGroupFields.ID.name() + "!=" + rolloutGroupId, 3);
assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + -1, 0); assertRSQLQuery(RolloutGroupFields.ID.name() + "==" + -1, 0);
@@ -62,7 +61,7 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest {
assertRSQLQuery(RolloutGroupFields.ID.name() + "==*", 4); assertRSQLQuery(RolloutGroupFields.ID.name() + "==*", 4);
assertRSQLQuery(RolloutGroupFields.ID.name() + "==noexist*", 0); assertRSQLQuery(RolloutGroupFields.ID.name() + "==noexist*", 0);
assertRSQLQuery(RolloutGroupFields.ID.name() + "=in=(" + rolloutGroupId + ",10000000)", 1); 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 @Test
@@ -87,12 +86,12 @@ public class RSQLRolloutGroupFields extends AbstractJpaIntegrationTest {
assertRSQLQuery(RolloutGroupFields.DESCRIPTION.name() + "=out=(group-1,notexist)", 3); 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<RolloutGroup> findTargetPage = rolloutGroupManagement.findByRolloutAndRsql(PageRequest.of(0, 100), final Page<RolloutGroup> findTargetPage = rolloutGroupManagement.findByRolloutAndRsql(PageRequest.of(0, 100),
rollout.getId(), rsqlParam); rollout.getId(), rsqlParam);
final long countTargetsAll = findTargetPage.getTotalElements(); final long countTargetsAll = findTargetPage.getTotalElements();
assertThat(findTargetPage).isNotNull(); assertThat(findTargetPage).isNotNull();
assertThat(countTargetsAll).isEqualTo(expcetedTargets); assertThat(countTargetsAll).isEqualTo(expectedTargets);
} }
private Rollout createRollout(final String name, final int amountGroups, final long distributionSetId, private Rollout createRollout(final String name, final int amountGroups, final long distributionSetId,