split out serenity-model - move part of junit tests to the model proj…

…ect -part 2
IvanLiulko · Apr 15, 2018 · 24c83d2 · 24c83d2
1 parent 94d7589
commit 24c83d2
Show file tree

Hide file tree

Showing 40 changed files with 21 additions and 5 deletions.
diff --git a/...dides/core/model/SampleTestResults.groovy → ...dides/core/model/SampleTestResults.groovy b/...dides/core/model/SampleTestResults.groovy → ...dides/core/model/SampleTestResults.groovy
diff --git a/serenity-core/src/test/java/sample/steps/FailingStep.java b/serenity-core/src/test/java/sample/steps/FailingStep.java
@@ -0,0 +1,12 @@
+package sample.steps;
+
+/**
+ * Created by john on 4/07/2014.
+ */
+public class FailingStep {
+
+    public Exception failsWithMessage(String message) {
+        return new IllegalArgumentException(message);
+    }
+
+}
diff --git a/serenity-model/build.gradle b/serenity-model/build.gradle
@@ -18,6 +18,9 @@ dependencies {
     compile "joda-time:joda-time:${jodaTimeVersion}"
     compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
     compile "commons-io:commons-io:${commonsIoVersion}"
+    compile("commons-beanutils:commons-beanutils-core:${beanUtilsVersion}") {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
     compile "javax.validation:validation-api:${javaxValidationVersion}"
     compile "net.sf.opencsv:opencsv:${openCsvVersion}"
     compile "com.google.code.gson:gson:${gsonVersion}"
@@ -47,4 +50,10 @@ dependencies {
     compile 'es.nitaur.markdown:txtmark:0.16'
 
     testCompile project(':serenity-test-utils')
+    testCompile project(':serenity-sample-alternative-resources')
+    testCompile("org.spockframework:spock-core:${spockVersion}") {
+        exclude group: "junit"
+        exclude group: "org.codehaus.groovy"
+
+    }
 }
diff --git a/.../core/matchers/BeanCollectionMatcher.java → .../core/matchers/BeanCollectionMatcher.java b/.../core/matchers/BeanCollectionMatcher.java → .../core/matchers/BeanCollectionMatcher.java
diff --git a/...dides/core/matchers/BeanCountMatcher.java → ...dides/core/matchers/BeanCountMatcher.java b/...dides/core/matchers/BeanCountMatcher.java → ...dides/core/matchers/BeanCountMatcher.java
diff --git a/...dides/core/matchers/BeanFieldMatcher.java → ...dides/core/matchers/BeanFieldMatcher.java b/...dides/core/matchers/BeanFieldMatcher.java → ...dides/core/matchers/BeanFieldMatcher.java
diff --git a/...thucydides/core/matchers/BeanMatcher.java → ...thucydides/core/matchers/BeanMatcher.java b/...thucydides/core/matchers/BeanMatcher.java → ...thucydides/core/matchers/BeanMatcher.java
diff --git a/...des/core/matchers/BeanMatcherAsserts.java → ...des/core/matchers/BeanMatcherAsserts.java b/...des/core/matchers/BeanMatcherAsserts.java → ...des/core/matchers/BeanMatcherAsserts.java
diff --git a/...hucydides/core/matchers/BeanMatchers.java → ...hucydides/core/matchers/BeanMatchers.java b/...hucydides/core/matchers/BeanMatchers.java → ...hucydides/core/matchers/BeanMatchers.java
diff --git a/...es/core/matchers/BeanPropertyMatcher.java → ...es/core/matchers/BeanPropertyMatcher.java b/...es/core/matchers/BeanPropertyMatcher.java → ...es/core/matchers/BeanPropertyMatcher.java
diff --git a/.../core/matchers/BeanUniquenessMatcher.java → .../core/matchers/BeanUniquenessMatcher.java b/.../core/matchers/BeanUniquenessMatcher.java → .../core/matchers/BeanUniquenessMatcher.java
diff --git a/...core/matchers/BigDecimalValueMatcher.java → ...core/matchers/BigDecimalValueMatcher.java b/...core/matchers/BigDecimalValueMatcher.java → ...core/matchers/BigDecimalValueMatcher.java
diff --git a/...hucydides/core/matchers/FileMatchers.java → ...hucydides/core/matchers/FileMatchers.java b/...hucydides/core/matchers/FileMatchers.java → ...hucydides/core/matchers/FileMatchers.java
diff --git a/...ore/matchers/InstantiatedBeanMatcher.java → ...ore/matchers/InstantiatedBeanMatcher.java b/...ore/matchers/InstantiatedBeanMatcher.java → ...ore/matchers/InstantiatedBeanMatcher.java
diff --git a/...s/core/matchers/MaxFieldValueMatcher.java → ...s/core/matchers/MaxFieldValueMatcher.java b/...s/core/matchers/MaxFieldValueMatcher.java → ...s/core/matchers/MaxFieldValueMatcher.java
diff --git a/...s/core/matchers/MinFieldValueMatcher.java → ...s/core/matchers/MinFieldValueMatcher.java b/...s/core/matchers/MinFieldValueMatcher.java → ...s/core/matchers/MinFieldValueMatcher.java
diff --git a/...re/matchers/PublicThucydidesMatchers.java → ...re/matchers/PublicThucydidesMatchers.java b/...re/matchers/PublicThucydidesMatchers.java → ...re/matchers/PublicThucydidesMatchers.java
diff --git a/...e/matchers/TestOutcomeResultsMatcher.java → ...e/matchers/TestOutcomeResultsMatcher.java b/...e/matchers/TestOutcomeResultsMatcher.java → ...e/matchers/TestOutcomeResultsMatcher.java
diff --git a/...dides/core/matchers/dates/BeanFields.java → ...dides/core/matchers/dates/BeanFields.java b/...dides/core/matchers/dates/BeanFields.java → ...dides/core/matchers/dates/BeanFields.java
diff --git a/...teCollectionContainsSameDatesMatcher.java → ...teCollectionContainsSameDatesMatcher.java b/...teCollectionContainsSameDatesMatcher.java → ...teCollectionContainsSameDatesMatcher.java
diff --git a/...s/core/matchers/dates/DateComparator.java → ...s/core/matchers/dates/DateComparator.java b/...s/core/matchers/dates/DateComparator.java → ...s/core/matchers/dates/DateComparator.java
diff --git a/...re/matchers/dates/DateIsAfterMatcher.java → ...re/matchers/dates/DateIsAfterMatcher.java b/...re/matchers/dates/DateIsAfterMatcher.java → ...re/matchers/dates/DateIsAfterMatcher.java
diff --git a/...e/matchers/dates/DateIsBeforeMatcher.java → ...e/matchers/dates/DateIsBeforeMatcher.java b/...e/matchers/dates/DateIsBeforeMatcher.java → ...e/matchers/dates/DateIsBeforeMatcher.java
diff --git a/.../matchers/dates/DateIsBetweenMatcher.java → .../matchers/dates/DateIsBetweenMatcher.java b/.../matchers/dates/DateIsBetweenMatcher.java → .../matchers/dates/DateIsBetweenMatcher.java
diff --git a/...e/matchers/dates/DateIsSameAsMatcher.java → ...e/matchers/dates/DateIsSameAsMatcher.java b/...e/matchers/dates/DateIsSameAsMatcher.java → ...e/matchers/dates/DateIsSameAsMatcher.java
diff --git a/.../matchers/dates/DateMatcherFormatter.java → .../matchers/dates/DateMatcherFormatter.java b/.../matchers/dates/DateMatcherFormatter.java → .../matchers/dates/DateMatcherFormatter.java
diff --git a/...des/core/matchers/dates/DateMatchers.java → ...des/core/matchers/dates/DateMatchers.java b/...des/core/matchers/dates/DateMatchers.java → ...des/core/matchers/dates/DateMatchers.java
diff --git a/...meCollectionContainsSameDatesMatcher.java → ...meCollectionContainsSameDatesMatcher.java b/...meCollectionContainsSameDatesMatcher.java → ...meCollectionContainsSameDatesMatcher.java
diff --git a/...atchers/dates/DateTimeIsAfterMatcher.java → ...atchers/dates/DateTimeIsAfterMatcher.java b/...atchers/dates/DateTimeIsAfterMatcher.java → ...atchers/dates/DateTimeIsAfterMatcher.java
diff --git a/...tchers/dates/DateTimeIsBeforeMatcher.java → ...tchers/dates/DateTimeIsBeforeMatcher.java b/...tchers/dates/DateTimeIsBeforeMatcher.java → ...tchers/dates/DateTimeIsBeforeMatcher.java
diff --git a/...chers/dates/DateTimeIsBetweenMatcher.java → ...chers/dates/DateTimeIsBetweenMatcher.java b/...chers/dates/DateTimeIsBetweenMatcher.java → ...chers/dates/DateTimeIsBetweenMatcher.java
diff --git a/...ers/dates/DateTimeIsCloseToAsMatcher.java → ...ers/dates/DateTimeIsCloseToAsMatcher.java b/...ers/dates/DateTimeIsCloseToAsMatcher.java → ...ers/dates/DateTimeIsCloseToAsMatcher.java
diff --git a/...tchers/dates/DateTimeIsSameAsMatcher.java → ...tchers/dates/DateTimeIsSameAsMatcher.java b/...tchers/dates/DateTimeIsSameAsMatcher.java → ...tchers/dates/DateTimeIsSameAsMatcher.java
diff --git a/...rs/dates/DateTimeIsSameTimeAsMatcher.java → ...rs/dates/DateTimeIsSameTimeAsMatcher.java b/...rs/dates/DateTimeIsSameTimeAsMatcher.java → ...rs/dates/DateTimeIsSameTimeAsMatcher.java
diff --git a/...atchers/dates/TimeIsCloseToAsMatcher.java → ...atchers/dates/TimeIsCloseToAsMatcher.java b/...atchers/dates/TimeIsCloseToAsMatcher.java → ...atchers/dates/TimeIsCloseToAsMatcher.java
diff --git a/...ion/WhenLoadingClassesFromAPackage.groovy → ...ion/WhenLoadingClassesFromAPackage.groovy b/...ion/WhenLoadingClassesFromAPackage.groovy → ...ion/WhenLoadingClassesFromAPackage.groovy
diff --git a/.../core/reflection/samples/SomeClass.groovy → .../core/reflection/samples/SomeClass.groovy b/.../core/reflection/samples/SomeClass.groovy → .../core/reflection/samples/SomeClass.groovy
diff --git a/...e/reflection/samples/SomeTestClass.groovy → ...e/reflection/samples/SomeTestClass.groovy b/...e/reflection/samples/SomeTestClass.groovy → ...e/reflection/samples/SomeTestClass.groovy
diff --git a/...henRecordingTestOutputInASpreadsheet.java → ...henRecordingTestOutputInASpreadsheet.java b/...henRecordingTestOutputInASpreadsheet.java → ...henRecordingTestOutputInASpreadsheet.java
diff --git a/serenity-model/src/test/java/sample/steps/FailingStep.java b/serenity-model/src/test/java/sample/steps/FailingStep.java
@@ -1,7 +1,5 @@
 package sample.steps;
 
-import org.openqa.selenium.ElementNotVisibleException;
-
 /**
  * Created by john on 4/07/2014.
  */
@@ -11,7 +9,4 @@ public Exception failsWithMessage(String message) {
         return new IllegalArgumentException(message);
     }
 
-    public Exception failsWith(ElementNotVisibleException cause) {
-        return cause;
-    }
 }