Merge pull request #8 from slu-it/test-optimization

Test optimization

Author: slu-it

pom.xml

@@ -103,6 +103,7 @@
 		<version.findbugs.maven.plugin>3.0.3</version.findbugs.maven.plugin>
 		<version.license.maven.plugin>1.8</version.license.maven.plugin>
 		<version.jacoco.maven.plugin>0.7.6.201602180812</version.jacoco.maven.plugin>
+		<version.pitest.maven.plugin>1.1.10</version.pitest.maven.plugin>
 
 	</properties>
 
@@ -287,13 +288,18 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<!-- record coverage metrics -->
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 			</plugin>
-
+			
+			<plugin>
+				<!-- execute mutation tests -->
+				<groupId>org.pitest</groupId>
+				<artifactId>pitest-maven</artifactId>
+			</plugin>
+			
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -659,6 +665,21 @@
 					</executions>
 				</plugin>
 
+				<plugin>
+					<!-- mutation testing -->
+					<groupId>org.pitest</groupId>
+					<artifactId>pitest-maven</artifactId>
+					<version>${version.pitest.maven.plugin}</version>
+					<configuration>
+						<targetClasses>
+							<param>info.novatec.testit.webtester.*</param>
+						</targetClasses>
+						<targetTests>
+							<param>info.novatec.testit.webtester.*</param>
+						</targetTests>
+					</configuration>
+				</plugin>
+
 			</plugins>
 		</pluginManagement>
 
@@ -761,26 +782,6 @@
 				<role>developer</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>pmo</id>
-			<name>Pascal Moll</name>
-			<email>pascal.moll@novatec-gmbh.de</email>
-			<organization>NovaTec Consulting GmbH</organization>
-			<organizationUrl>http://www.novatec-gmbh.de</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
-		<developer>
-			<id>benhamidene</id>
-			<name>Anis Ben Hamidene</name>
-			<email>anis.benhamidene@novatec-gmbh.de</email>
-			<organization>NovaTec Consulting GmbH</organization>
-			<organizationUrl>http://www.novatec-gmbh.de</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
 	</developers>
 
 </project>

webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java

@@ -3,12 +3,14 @@
 import org.assertj.core.api.Assertions;
 
 import info.novatec.testit.webtester.pagefragments.Button;
+import info.novatec.testit.webtester.pagefragments.GenericSelect;
 import info.novatec.testit.webtester.pagefragments.GenericTextField;
 import info.novatec.testit.webtester.pagefragments.MultiSelect;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
 import info.novatec.testit.webtester.pagefragments.traits.Selectable;
 import info.novatec.testit.webtester.support.assertj.assertions.pagefragments.ButtonAssert;
+import info.novatec.testit.webtester.support.assertj.assertions.pagefragments.GenericSelectAssert;
 import info.novatec.testit.webtester.support.assertj.assertions.pagefragments.GenericTextFieldAssert;
 import info.novatec.testit.webtester.support.assertj.assertions.pagefragments.MultiSelectAssert;
 import info.novatec.testit.webtester.support.assertj.assertions.pagefragments.PageFragmentAssert;
@@ -68,6 +70,19 @@ public static ButtonAssert assertThat(Button actual) {
         return new ButtonAssert(actual);
     }
 
+    /**
+     * Creates a new {@link GenericSelectAssert} for the given {@link GenericSelect}.
+     *
+     * @param actual the select to assert
+     * @return the new assert instance
+     * @see GenericSelect
+     * @see GenericSelectAssert
+     * @since 2.0
+     */
+    public static GenericSelectAssert assertThat(GenericSelect actual) {
+        return new GenericSelectAssert(actual, GenericSelectAssert.class);
+    }
+
     /**
      * Creates a new {@link SingleSelectAssert} for the given {@link SingleSelect}.
      *

webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/AbstractWebTesterAssert.java

@@ -8,18 +8,28 @@
  *
  * @param <A> the "self" type of this assertion class. Please read
  * <a href="http://bit.ly/anMa4g" target="_blank">
- *     Emulating 'self types'using Java Generics to simplify fluent API implementation
+ * Emulating 'self types'using Java Generics to simplify fluent API implementation
  * </a>
  * for more details.
  * @param <B> the type of the "actual" value.
  * @since 2.0
  */
 public abstract class AbstractWebTesterAssert<A, B> extends AbstractAssert<AbstractWebTesterAssert<A, B>, B> {
 
-    public AbstractWebTesterAssert(B actual, Class<?> selfType) {
+    public AbstractWebTesterAssert(B actual, Class<A> selfType) {
         super(actual, selfType);
     }
 
+    /**
+     * Noop method for syntax purposes.
+     *
+     * @return the same Assertion instance for fluent API use.
+     * @since 2.0
+     */
+    public A and() {
+        return ( A ) this;
+    }
+
     protected final void failOnActualBeingNull() {
         if (actual == null) {
             failWithMessage("actual is null");

…/pagefragments/AbstractSelectAssert.java …s/pagefragments/GenericSelectAssert.javawebtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/AbstractSelectAssert.java renamed to webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/GenericSelectAssert.java webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/AbstractSelectAssert.java renamed to webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/GenericSelectAssert.java

@@ -17,10 +17,10 @@
  * @since 2.0
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-public abstract class AbstractSelectAssert<A extends AbstractSelectAssert, B extends GenericSelect>
+public class GenericSelectAssert<A extends GenericSelectAssert, B extends GenericSelect>
     extends AbstractPageFragmentAssert<A, B> {
 
-    protected AbstractSelectAssert(B actual, Class<A> selfType) {
+    public GenericSelectAssert(B actual, Class<A> selfType) {
         super(actual, selfType);
     }
 

webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/MultiSelectAssert.java

@@ -16,7 +16,7 @@
  * @see MultiSelect
  * @since 2.0
  */
-public class MultiSelectAssert extends AbstractSelectAssert<MultiSelectAssert, MultiSelect> {
+public class MultiSelectAssert extends GenericSelectAssert<MultiSelectAssert, MultiSelect> {
 
     public MultiSelectAssert(MultiSelect actual) {
         super(actual, MultiSelectAssert.class);

webtester-support-assertj3/src/main/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/SingleSelectAssert.java

@@ -14,7 +14,7 @@
  * @see SingleSelect
  * @since 2.0
  */
-public class SingleSelectAssert extends AbstractSelectAssert<SingleSelectAssert, SingleSelect> {
+public class SingleSelectAssert extends GenericSelectAssert<SingleSelectAssert, SingleSelect> {
 
     public SingleSelectAssert(SingleSelect actual) {
         super(actual, SingleSelectAssert.class);

webtester-support-assertj3/src/test/java/info/novatec/testit/webtester/support/assertj/assertions/AbstractWebTesterAssertTest.java

@@ -0,0 +1,45 @@
+package info.novatec.testit.webtester.support.assertj.assertions;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Enclosed.class)
+public class AbstractWebTesterAssertTest {
+
+    public static class FailOnActualBeingNull {
+
+        @Test
+        public void nonNullActualPasses() {
+            new TestAssert("foo").failOnActualBeingNull();
+        }
+
+        @Test(expected = AssertionError.class)
+        public void nullActualThrowsError() {
+            new TestAssert(null).failOnActualBeingNull();
+        }
+
+    }
+
+    public static class And {
+
+        @Test
+        public void invocationReturnsSameAssertionInstance() {
+            TestAssert original = new TestAssert("foo");
+            TestAssert returned = original.and();
+            Assertions.assertThat(returned).isSameAs(original);
+        }
+
+    }
+
+    private static class TestAssert extends AbstractWebTesterAssert<TestAssert, String> {
+
+        public TestAssert(String actual) {
+            super(actual, TestAssert.class);
+        }
+
+    }
+
+}

webtester-support-assertj3/src/test/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/AbstractPageFragmentAssertTest.java

@@ -0,0 +1,23 @@
+package info.novatec.testit.webtester.support.assertj.assertions.pagefragments;
+
+import org.junit.Test;
+
+import info.novatec.testit.webtester.pagefragments.PageFragment;
+
+
+public class AbstractPageFragmentAssertTest {
+
+    @Test(expected = AssertionError.class)
+    public void nullPageFragmentsCantBeAsserted() {
+        new TestAssert(null);
+    }
+
+    private static class TestAssert extends AbstractPageFragmentAssert<TestAssert, PageFragment> {
+
+        public TestAssert(PageFragment actual) {
+            super(actual, TestAssert.class);
+        }
+
+    }
+
+}

webtester-support-assertj3/src/test/java/info/novatec/testit/webtester/support/assertj/assertions/pagefragments/ButtonAssertTest.java

@@ -5,36 +5,58 @@
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
 
 import info.novatec.testit.webtester.pagefragments.Button;
 
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(Enclosed.class)
 public class ButtonAssertTest {
 
-    @Test
-    public void hasLabelPositive() {
-        assertThat(buttonWithLabel("foo")).hasLabel("foo");
-    }
+    public static class HasLabel {
 
-    @Test(expected = AssertionError.class)
-    public void hasLabelNegative() {
-        assertThat(buttonWithLabel("bar")).hasLabel("foo");
-    }
+        @Test
+        public void havingLabelPasses() {
+            assertThat(buttonWithLabel("foo")).hasLabel("foo");
+        }
+
+        @Test(expected = AssertionError.class)
+        public void notHavingLabelFails() {
+            assertThat(buttonWithLabel("bar")).hasLabel("foo");
+        }
+
+        @Test
+        public void invocationReturnsSameAssertionInstance() {
+            ButtonAssert original = assertThat(buttonWithLabel("foo"));
+            ButtonAssert returned = original.hasLabel("foo");
+            assertThat(returned).isSameAs(original);
+        }
 
-    @Test
-    public void notHasLabelPositive() {
-        assertThat(buttonWithLabel("bar")).hasNotLabel("foo");
     }
 
-    @Test(expected = AssertionError.class)
-    public void notHasLabelNegative() {
-        assertThat(buttonWithLabel("foo")).hasNotLabel("foo");
+    public static class NotHasLabel {
+
+        @Test
+        public void notHavingLabelPasses() {
+            assertThat(buttonWithLabel("bar")).hasNotLabel("foo");
+        }
+
+        @Test(expected = AssertionError.class)
+        public void havingLabelFails() {
+            assertThat(buttonWithLabel("foo")).hasNotLabel("foo");
+        }
+
+        @Test
+        public void invocationReturnsSameAssertionInstance() {
+            ButtonAssert original = assertThat(buttonWithLabel("bar"));
+            ButtonAssert returned = original.hasNotLabel("foo");
+            assertThat(returned).isSameAs(original);
+        }
+
     }
 
-    private Button buttonWithLabel(String label) {
+    private static Button buttonWithLabel(String label) {
         Button button = mock(Button.class);
         doReturn(label).when(button).getLabel();
         return button;