Optimized Hamcrest matcher tests according to mutation test results

Author: slu-it

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/WebTesterMatchers.java

@@ -109,23 +109,23 @@ public static <T extends Button> Matcher<T> label(String label) {
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithTexts(String... texts) {
-        return new SelectionTextsMatcher<>(Arrays.asList(texts));
+        return selectionWithTexts(Arrays.asList(texts));
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithTexts(List<String> texts) {
         return new SelectionTextsMatcher<>(texts);
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithValues(String... values) {
-        return new SelectionValuesMatcher<>(Arrays.asList(values));
+        return selectionWithValues(Arrays.asList(values));
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithValues(List<String> values) {
         return new SelectionValuesMatcher<>(values);
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithIndices(Integer... indices) {
-        return new SelectionIndicesMatcher<>(Arrays.asList(indices));
+        return selectionWithIndices(Arrays.asList(indices));
     }
 
     public static <T extends MultiSelect> Matcher<T> selectionWithIndices(List<Integer> indices) {
@@ -169,15 +169,15 @@ public static <T extends GenericSelect> Matcher<T> noOptions() {
     }
 
     public static <T extends GenericSelect> Matcher<T> optionsWithTexts(String... texts) {
-        return new OptionsTextsMatcher<>(Arrays.asList(texts));
+        return optionsWithTexts(Arrays.asList(texts));
     }
 
     public static <T extends GenericSelect> Matcher<T> optionsWithTexts(List<String> texts) {
         return new OptionsTextsMatcher<>(texts);
     }
 
     public static <T extends GenericSelect> Matcher<T> optionsWithValues(String... values) {
-        return new OptionsValuesMatcher<>(Arrays.asList(values));
+        return optionsWithValues(Arrays.asList(values));
     }
 
     public static <T extends GenericSelect> Matcher<T> optionsWithValues(List<String> values) {

webtester-support-hamcrest/src/test/java/info/novatec/testit/webtester/support/hamcrest/matchers/pagefragments/AttributeValueMatcherTest.java

@@ -2,9 +2,12 @@
 
 import static info.novatec.testit.webtester.support.hamcrest.WebTesterMatchers.attributeValue;
 import static info.novatec.testit.webtester.support.hamcrest.WebTesterMatchers.has;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import utils.MockFactory;
 
@@ -13,22 +16,35 @@
 
 public class AttributeValueMatcherTest {
 
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
     @Test
     public void attributeWithValueMatches() {
         PageFragment fragment = MockFactory.fragment().withAttribute("foo", "value").build();
         assertThat(fragment, has(attributeValue("foo", "value")));
     }
 
-    @Test(expected = AssertionError.class)
+    @Test
     public void nonExistentAttributeDoesNotMatch() {
+
+        exception.expect(AssertionError.class);
+        exception.expectMessage(containsString("attribute was not present"));
+
         PageFragment fragment = MockFactory.fragment().withoutAttribute("foo").build();
         assertThat(fragment, has(attributeValue("foo", "value")));
+
     }
 
-    @Test(expected = AssertionError.class)
+    @Test
     public void wrongValueDoesNotMatch() {
+
+        exception.expect(AssertionError.class);
+        exception.expectMessage(containsString("value was <other value>"));
+
         PageFragment fragment = MockFactory.fragment().withAttribute("foo", "other value").build();
         assertThat(fragment, has(attributeValue("foo", "value")));
+
     }
 
 }