From 43d01da309f2d81b62fc29a46cb7ccfa00e3317d Mon Sep 17 00:00:00 2001 From: SirWayne Date: Mon, 7 Mar 2016 13:35:26 +0100 Subject: [PATCH] Fix typo after pull request review Signed-off-by: SirWayne --- .../hawkbit/repository/TagManagementTest.java | 31 +++++++++---------- .../rsql/RSQLDistributionSetFieldTest.java | 2 +- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java index b1c2cf3e3..eb263b242 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TagManagementTest.java @@ -172,11 +172,9 @@ public class TagManagementTest extends AbstractIntegrationTest { public void createTargetTag() { final Tag tag = tagManagement.createTargetTag(new TargetTag("kai1", "kai2", "colour")); - assertThat(targetTagRepository.findByNameEquals("kai1").getDescription()).as("wrong tag founded") - .isEqualTo("kai2"); - assertThat(tagManagement.findTargetTag("kai1").getColour()).as("wrong tag founded").isEqualTo("colour"); - assertThat(tagManagement.findTargetTagById(tag.getId()).getColour()).as("wrong tag founded") - .isEqualTo("colour"); + assertThat(targetTagRepository.findByNameEquals("kai1").getDescription()).as("wrong tag ed").isEqualTo("kai2"); + assertThat(tagManagement.findTargetTag("kai1").getColour()).as("wrong tag found").isEqualTo("colour"); + assertThat(tagManagement.findTargetTagById(tag.getId()).getColour()).as("wrong tag found").isEqualTo("colour"); } @Test @@ -200,7 +198,7 @@ public class TagManagementTest extends AbstractIntegrationTest { assertThat(targetManagement.findTargetByControllerID(target.getControllerId()).getTags()) .doesNotContain(toDelete); } - assertThat(targetTagRepository.findOne(toDelete.getId())).as("No tag should be founded").isNull(); + assertThat(targetTagRepository.findOne(toDelete.getId())).as("No tag should be found").isNull(); assertThat(tagManagement.findAllTargetTags()).as("Wrong target tag size").hasSize(19); } @@ -229,11 +227,10 @@ public class TagManagementTest extends AbstractIntegrationTest { public void createDistributionSetTag() { final Tag tag = tagManagement.createDistributionSetTag(new DistributionSetTag("kai1", "kai2", "colour")); - assertThat(distributionSetTagRepository.findByNameEquals("kai1").getDescription()).as("wrong tag founded") + assertThat(distributionSetTagRepository.findByNameEquals("kai1").getDescription()).as("wrong tag found") .isEqualTo("kai2"); - assertThat(tagManagement.findDistributionSetTag("kai1").getColour()).as("wrong tag founded") - .isEqualTo("colour"); - assertThat(tagManagement.findDistributionSetTagById(tag.getId()).getColour()).as("wrong tag founded") + assertThat(tagManagement.findDistributionSetTag("kai1").getColour()).as("wrong tag found").isEqualTo("colour"); + assertThat(tagManagement.findDistributionSetTagById(tag.getId()).getColour()).as("wrong tag found") .isEqualTo("colour"); } @@ -254,7 +251,7 @@ public class TagManagementTest extends AbstractIntegrationTest { for (final DistributionSet set : distributionSetRepository.findAll()) { assertThat(distributionSetManagement.findDistributionSetByIdWithDetails(set.getId()).getTags()) - .as("Wrong tag founded").contains(toDelete); + .as("Wrong tag found").contains(toDelete); } // delete @@ -265,7 +262,7 @@ public class TagManagementTest extends AbstractIntegrationTest { assertThat(tagManagement.findAllDistributionSetTags()).as("Wrong size of tags after deletion").hasSize(19); for (final DistributionSet set : distributionSetRepository.findAll()) { assertThat(distributionSetManagement.findDistributionSetByIdWithDetails(set.getId()).getTags()) - .as("Wrong founded tags").doesNotContain(toDelete); + .as("Wrong found tags").doesNotContain(toDelete); } } @@ -274,7 +271,7 @@ public class TagManagementTest extends AbstractIntegrationTest { tagManagement.createTargetTag(new TargetTag("A")); try { tagManagement.createTargetTag(new TargetTag("A")); - fail("Excpeted EntityAlreadyExistsException"); + fail("Expected EntityAlreadyExistsException"); } catch (final EntityAlreadyExistsException e) { } } @@ -286,7 +283,7 @@ public class TagManagementTest extends AbstractIntegrationTest { tag.setName("A"); try { tagManagement.updateTargetTag(tag); - fail("Excpeted EntityAlreadyExistsException"); + fail("Expected EntityAlreadyExistsException"); } catch (final EntityAlreadyExistsException e) { } } @@ -296,7 +293,7 @@ public class TagManagementTest extends AbstractIntegrationTest { tagManagement.createDistributionSetTag(new DistributionSetTag("A")); try { tagManagement.createDistributionSetTag(new DistributionSetTag("A")); - fail("Excpeted EntityAlreadyExistsException"); + fail("Expected EntityAlreadyExistsException"); } catch (final EntityAlreadyExistsException e) { } } @@ -308,7 +305,7 @@ public class TagManagementTest extends AbstractIntegrationTest { tag.setName("A"); try { tagManagement.updateDistributionSetTag(tag); - fail("Excpeted EntityAlreadyExistsException"); + fail("Expected EntityAlreadyExistsException"); } catch (final EntityAlreadyExistsException e) { } } @@ -329,7 +326,7 @@ public class TagManagementTest extends AbstractIntegrationTest { // check data assertThat(tagManagement.findAllDistributionSetTags()).as("Wrong size of ds tags").hasSize(tags.size()); - assertThat(distributionSetTagRepository.findOne(savedAssigned.getId()).getName()).as("Wrong ds tag founded") + assertThat(distributionSetTagRepository.findOne(savedAssigned.getId()).getName()).as("Wrong ds tag found") .isEqualTo("test123"); } diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java index add5419ee..ea1db0ed8 100644 --- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java +++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/rsql/RSQLDistributionSetFieldTest.java @@ -98,7 +98,7 @@ public class RSQLDistributionSetFieldTest extends AbstractIntegrationTest { assertRSQLQuery(DistributionSetFields.COMPLETE.name() + "==true", 4); try { assertRSQLQuery(DistributionSetFields.COMPLETE.name() + "==noExist*", 0); - fail("Excepted RSQLParameterSyntaxException"); + fail("Expected RSQLParameterSyntaxException"); } catch (final RSQLParameterSyntaxException e) { } assertRSQLQuery(DistributionSetFields.COMPLETE.name() + "=in=(true)", 4);