From 8d2c168f104c0ca62ad530b6ea39c64ad70f7cea Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Mon, 15 Aug 2022 10:46:17 +0300 Subject: [PATCH] test: Clean up unit tests asserting thrown exceptions --- .../java_client/android/AndroidContextTest.java | 6 +----- .../java_client/android/AndroidFunctionTest.java | 6 ++---- .../io/appium/java_client/internal/ConfigTest.java | 6 ++---- .../io/appium/java_client/ios/IOSContextTest.java | 6 +----- .../pagefactory_tests/AndroidPageObjectTest.java | 6 ++---- .../java_client/service/local/ServerBuilderTest.java | 12 +++--------- 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/src/test/java/io/appium/java_client/android/AndroidContextTest.java b/src/test/java/io/appium/java_client/android/AndroidContextTest.java index 57f5895d8..ed832f9e3 100644 --- a/src/test/java/io/appium/java_client/android/AndroidContextTest.java +++ b/src/test/java/io/appium/java_client/android/AndroidContextTest.java @@ -48,11 +48,7 @@ public class AndroidContextTest extends BaseAndroidTest { } @Test public void testContextError() { - assertThrows(NoSuchContextException.class, - () -> { - driver.context("Planet of the Ape-ium"); - assertEquals("Planet of the Ape-ium", driver.getContext()); - }); + assertThrows(NoSuchContextException.class, () -> driver.context("Planet of the Ape-ium")); } } diff --git a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java index 735d0aeda..3b915eae1 100644 --- a/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java +++ b/src/test/java/io/appium/java_client/android/AndroidFunctionTest.java @@ -6,7 +6,6 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.StringContains.containsString; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import io.appium.java_client.functions.AppiumFunction; import io.appium.java_client.functions.ExpectedCondition; @@ -132,8 +131,7 @@ public void complexWaitingTestWithPreCondition() { public void nullPointerExceptionSafetyTestWithPrecondition() { Wait wait = new FluentWait<>(Pattern.compile("Fake_context")) .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500)); - assertThrows(TimeoutException.class, - () -> assertTrue(wait.until(searchingFunction.compose(contextFunction)).size() > 0)); + assertThrows(TimeoutException.class, () -> wait.until(searchingFunction.compose(contextFunction))); } @Test @@ -141,6 +139,6 @@ public void nullPointerExceptionSafetyTestWithPostConditions() { Wait wait = new FluentWait<>(Pattern.compile("Fake_context")) .withTimeout(ofSeconds(30)).pollingEvery(ofMillis(500)); assertThrows(TimeoutException.class, - () -> assertTrue(wait.until(contextFunction.andThen(searchingFunction).andThen(filteringFunction)).size() > 0)); + () -> wait.until(contextFunction.andThen(searchingFunction).andThen(filteringFunction))); } } diff --git a/src/test/java/io/appium/java_client/internal/ConfigTest.java b/src/test/java/io/appium/java_client/internal/ConfigTest.java index 4ae2feb6c..cd2bd390c 100644 --- a/src/test/java/io/appium/java_client/internal/ConfigTest.java +++ b/src/test/java/io/appium/java_client/internal/ConfigTest.java @@ -20,14 +20,12 @@ public void verifyGettingExistingValue() { @Test public void verifyGettingNonExistingValue() { - assertThrows(IllegalArgumentException.class, - () -> assertThat(Config.main().getValue(MISSING_KEY, String.class).length(), greaterThan(0))); + assertThrows(IllegalArgumentException.class, () -> Config.main().getValue(MISSING_KEY, String.class)); } @Test public void verifyGettingExistingValueWithWrongClass() { - assertThrows(ClassCastException.class, - () -> assertThat(Config.main().getValue(EXISTING_KEY, Integer.class), greaterThan(0))); + assertThrows(ClassCastException.class, () -> Config.main().getValue(EXISTING_KEY, Integer.class)); } @Test diff --git a/src/test/java/io/appium/java_client/ios/IOSContextTest.java b/src/test/java/io/appium/java_client/ios/IOSContextTest.java index 57915a1f7..5c51aa677 100644 --- a/src/test/java/io/appium/java_client/ios/IOSContextTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSContextTest.java @@ -42,10 +42,6 @@ public class IOSContextTest extends BaseIOSWebViewTest { } @Test public void testContextError() { - assertThrows(NoSuchContextException.class, - () -> { - driver.context("Planet of the Ape-ium"); - assertEquals("Planet of the Ape-ium", driver.getContext()); - }); + assertThrows(NoSuchContextException.class, () -> driver.context("Planet of the Ape-ium")); } } diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java index c183c44e0..433aa2a1a 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java @@ -326,8 +326,7 @@ public class AndroidPageObjectTest extends BaseAndroidTest { @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy() { assertThrows(NoSuchElementException.class, - () -> assertNotNull( - elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text"))); + () -> elementWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.getAttribute("text")); } @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindByList() { @@ -351,8 +350,7 @@ public class AndroidPageObjectTest extends BaseAndroidTest { @Test public void checkThatElementSearchingThrowsExpectedExceptionIfChainedLocatorIsInvalid() { - assertThrows(NoSuchElementException.class, - () -> assertNotNull(elementFoundByInvalidChainedSelector.getAttribute("text"))); + assertThrows(NoSuchElementException.class, () -> elementFoundByInvalidChainedSelector.getAttribute("text")); } @Test public void checkThatListSearchingWorksIfChainedLocatorIsInvalid() { diff --git a/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java b/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java index fe5b9a3b6..cb97479e8 100644 --- a/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java +++ b/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java @@ -339,22 +339,16 @@ public void checkAbilityToStartServiceUsingValidBasePathWithSinglePathParams() { @Test public void checkAbilityToValidateBasePathForEmptyBasePath() { - assertThrows(IllegalArgumentException.class, () -> { - new AppiumServiceBuilder().withArgument(BASEPATH, "").build(); - }); + assertThrows(IllegalArgumentException.class, () -> new AppiumServiceBuilder().withArgument(BASEPATH, "")); } @Test public void checkAbilityToValidateBasePathForBlankBasePath() { - assertThrows(IllegalArgumentException.class, () -> { - new AppiumServiceBuilder().withArgument(BASEPATH, " ").build(); - }); + assertThrows(IllegalArgumentException.class, () -> new AppiumServiceBuilder().withArgument(BASEPATH, " ")); } @Test public void checkAbilityToValidateBasePathForNullBasePath() { - assertThrows(NullPointerException.class, () -> { - new AppiumServiceBuilder().withArgument(BASEPATH, null).build(); - }); + assertThrows(NullPointerException.class, () -> new AppiumServiceBuilder().withArgument(BASEPATH, null)); } }