From 2d8ada8a5214e3dc901f319052c7e6b16977366b Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 13:44:04 +0300 Subject: [PATCH 1/7] =?UTF-8?q?=D0=BC=D0=BE=D0=B5=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B2=D0=BE=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BE=D0=B5=D0=B3=D0=BE=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons-module/pom.xml | 21 ++++++++++ .../src/test/java}/school/MyFirstTest.java | 5 ++- pom.xml | 6 +++ steps-module/pom.xml | 9 +++- .../java/ru/qatools/school/data/Place.java | 41 +++++++++++++++++-- .../ru/qatools/school/steps/UserSteps.java | 9 +++- 6 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 commons-module/pom.xml rename {steps-module/src/test/java/ru/qatools => commons-module/src/test/java}/school/MyFirstTest.java (54%) diff --git a/commons-module/pom.xml b/commons-module/pom.xml new file mode 100644 index 0000000..09f52b4 --- /dev/null +++ b/commons-module/pom.xml @@ -0,0 +1,21 @@ + + + + school-2016 + ru.qatools.school + 1.0-SNAPSHOT + + 4.0.0 + + commons-module + + + + ru.qatools.school + steps-module + ${project.version} + + + \ No newline at end of file diff --git a/steps-module/src/test/java/ru/qatools/school/MyFirstTest.java b/commons-module/src/test/java/school/MyFirstTest.java similarity index 54% rename from steps-module/src/test/java/ru/qatools/school/MyFirstTest.java rename to commons-module/src/test/java/school/MyFirstTest.java index 5378485..4deb2f3 100644 --- a/steps-module/src/test/java/ru/qatools/school/MyFirstTest.java +++ b/commons-module/src/test/java/school/MyFirstTest.java @@ -1,5 +1,6 @@ -package ru.qatools.school; +package school; +import ru.qatools.school.data.Place; import static ru.qatools.school.steps.UserSteps.user; /** @@ -8,7 +9,7 @@ public class MyFirstTest { public void test() { - user().goTo(null); + user().checkLocation(null).goTo(Place.AT_YANDEX).checkLocation(Place.AT_YANDEX); } } diff --git a/pom.xml b/pom.xml index 206b663..ccf8308 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ steps-module + commons-module Automation Foreva @@ -18,6 +19,11 @@ + + junit + junit + 4.12 + \ No newline at end of file diff --git a/steps-module/pom.xml b/steps-module/pom.xml index fa52f60..5bfbd20 100644 --- a/steps-module/pom.xml +++ b/steps-module/pom.xml @@ -10,7 +10,14 @@ 4.0.0 jar - + + + junit + junit + 4.12 + + + steps-module Logic Module diff --git a/steps-module/src/main/java/ru/qatools/school/data/Place.java b/steps-module/src/main/java/ru/qatools/school/data/Place.java index 719cc4c..f1d6653 100644 --- a/steps-module/src/main/java/ru/qatools/school/data/Place.java +++ b/steps-module/src/main/java/ru/qatools/school/data/Place.java @@ -1,9 +1,44 @@ package ru.qatools.school.data; +import org.hamcrest.Description; +import org.hamcrest.Matcher; + /** * @author lanwen (Merkushev Kirill) */ -public enum Place { - HOME, - AT_YANDEX +public enum Place implements Matcher { + HOME { + public void describeTo(Description description) { + + } + + public boolean matches(Object o) { + return false; + } + + public void describeMismatch(Object o, Description description) { + + } + + public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { + + } + }, + AT_YANDEX { + public void describeTo(Description description) { + + } + + public boolean matches(Object o) { + return false; + } + + public void describeMismatch(Object o, Description description) { + + } + + public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { + + } + } } diff --git a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java index 043ad54..1da96c7 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -1,12 +1,13 @@ package ru.qatools.school.steps; import ru.qatools.school.data.Place; +import static org.junit.Assert.*; /** * @author lanwen (Merkushev Kirill) */ public class UserSteps { - + private Place place; private UserSteps() { @@ -20,4 +21,10 @@ public UserSteps goTo(Place place) { this.place = place; return this; } + + public UserSteps checkLocation(Place place){ + assertThat(place, this.place); + return this; + } + } From cf1dfa5d1bbdf3c2c9b7e02ddd940d70b4420eb8 Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 14:50:49 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0,=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/school/MyFirstTest.java | 19 +++++++++++++++---- .../ru/qatools/school/steps/UserSteps.java | 6 ++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/commons-module/src/test/java/school/MyFirstTest.java b/commons-module/src/test/java/school/MyFirstTest.java index 4deb2f3..5eafb5b 100644 --- a/commons-module/src/test/java/school/MyFirstTest.java +++ b/commons-module/src/test/java/school/MyFirstTest.java @@ -1,5 +1,6 @@ package school; +import org.junit.Test; import ru.qatools.school.data.Place; import static ru.qatools.school.steps.UserSteps.user; @@ -7,9 +8,19 @@ * @author lanwen (Merkushev Kirill) */ public class MyFirstTest { - - public void test() { - user().checkLocation(null).goTo(Place.AT_YANDEX).checkLocation(Place.AT_YANDEX); + + @Test + public void beAtNull() { + user().goTo(null).expectSameLocation(null); + } + + @Test + public void beInYndx() { + user().goTo(Place.AT_YANDEX).expectSameLocation(Place.AT_YANDEX); + } + + @Test + public void beAtHome() { + user().goTo(Place.HOME).expectSameLocation(Place.HOME); } - } diff --git a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java index 1da96c7..ba3511a 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -1,6 +1,8 @@ package ru.qatools.school.steps; import ru.qatools.school.data.Place; + +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; /** @@ -22,8 +24,8 @@ public UserSteps goTo(Place place) { return this; } - public UserSteps checkLocation(Place place){ - assertThat(place, this.place); + public UserSteps expectSameLocation(Place place){ + assertThat("this locations is same", this.place, is(place)); return this; } From c6e25c6dcf0e067bac5cf9b1da9780851b2755c5 Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 15:00:16 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0,=20=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D0=BE=D0=B4=D0=B0=20=D0=B2=D0=B5=D1=80=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/school/MyFirstTest.java | 10 ++--- .../java/ru/qatools/school/data/Place.java | 37 +------------------ .../ru/qatools/school/steps/UserSteps.java | 1 + 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/commons-module/src/test/java/school/MyFirstTest.java b/commons-module/src/test/java/school/MyFirstTest.java index 5eafb5b..5078193 100644 --- a/commons-module/src/test/java/school/MyFirstTest.java +++ b/commons-module/src/test/java/school/MyFirstTest.java @@ -9,16 +9,16 @@ */ public class MyFirstTest { - @Test - public void beAtNull() { - user().goTo(null).expectSameLocation(null); - } - @Test public void beInYndx() { user().goTo(Place.AT_YANDEX).expectSameLocation(Place.AT_YANDEX); } + @Test + public void beAtNull() { + user().goTo(null).expectSameLocation(null); + } + @Test public void beAtHome() { user().goTo(Place.HOME).expectSameLocation(Place.HOME); diff --git a/steps-module/src/main/java/ru/qatools/school/data/Place.java b/steps-module/src/main/java/ru/qatools/school/data/Place.java index f1d6653..6ee5b82 100644 --- a/steps-module/src/main/java/ru/qatools/school/data/Place.java +++ b/steps-module/src/main/java/ru/qatools/school/data/Place.java @@ -7,38 +7,5 @@ * @author lanwen (Merkushev Kirill) */ public enum Place implements Matcher { - HOME { - public void describeTo(Description description) { - - } - - public boolean matches(Object o) { - return false; - } - - public void describeMismatch(Object o, Description description) { - - } - - public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { - - } - }, - AT_YANDEX { - public void describeTo(Description description) { - - } - - public boolean matches(Object o) { - return false; - } - - public void describeMismatch(Object o, Description description) { - - } - - public void _dont_implement_Matcher___instead_extend_BaseMatcher_() { - - } - } -} + HOME, + AT_YANDEX} diff --git a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java index ba3511a..567d8d7 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -26,6 +26,7 @@ public UserSteps goTo(Place place) { public UserSteps expectSameLocation(Place place){ assertThat("this locations is same", this.place, is(place)); + return this; } From 760422a54ce3fea5dd73c0e6ef3c8113f0c1e90b Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 15:13:19 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D0=B9=20=D0=BA=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?= =?UTF-8?q?=D1=83=20=D0=B2=D0=B5=D1=80=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/qatools/school/steps/UserSteps.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java index 567d8d7..4b6abfe 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -25,8 +25,8 @@ public UserSteps goTo(Place place) { } public UserSteps expectSameLocation(Place place){ - assertThat("this locations is same", this.place, is(place)); - + assertThat("this locations is not same", this.place, is(place)); + return this; } From 0043a20cae8eca108b4bac4e039d4789535c1e68 Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 15:24:47 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- steps-module/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/steps-module/pom.xml b/steps-module/pom.xml index 5bfbd20..154e8df 100644 --- a/steps-module/pom.xml +++ b/steps-module/pom.xml @@ -10,13 +10,6 @@ 4.0.0 jar - - - junit - junit - 4.12 - - steps-module Logic Module From 5ad4dc2aacbec9da6c8e83b46c51ac096419981c Mon Sep 17 00:00:00 2001 From: rumm Date: Sun, 10 Apr 2016 16:08:42 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=203=20?= =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons-module/src/test/java/school/MyFirstTest.java | 6 +++--- steps-module/pom.xml | 2 +- .../src/main/java/ru/qatools/school/data/Place.java | 2 +- .../src/main/java/ru/qatools/school/steps/UserSteps.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons-module/src/test/java/school/MyFirstTest.java b/commons-module/src/test/java/school/MyFirstTest.java index 5078193..682deaa 100644 --- a/commons-module/src/test/java/school/MyFirstTest.java +++ b/commons-module/src/test/java/school/MyFirstTest.java @@ -10,17 +10,17 @@ public class MyFirstTest { @Test - public void beInYndx() { + public void shouldBeInYndxAsGoneToYndx() { user().goTo(Place.AT_YANDEX).expectSameLocation(Place.AT_YANDEX); } @Test - public void beAtNull() { + public void shouldBeAtNullAsGoneToNull() { user().goTo(null).expectSameLocation(null); } @Test - public void beAtHome() { + public void shouldBeAtHomeAsGoToHome() { user().goTo(Place.HOME).expectSameLocation(Place.HOME); } } diff --git a/steps-module/pom.xml b/steps-module/pom.xml index 154e8df..6052bd4 100644 --- a/steps-module/pom.xml +++ b/steps-module/pom.xml @@ -7,7 +7,7 @@ ru.qatools.school 1.0-SNAPSHOT - + 4.0.0 jar diff --git a/steps-module/src/main/java/ru/qatools/school/data/Place.java b/steps-module/src/main/java/ru/qatools/school/data/Place.java index 6ee5b82..09a19e9 100644 --- a/steps-module/src/main/java/ru/qatools/school/data/Place.java +++ b/steps-module/src/main/java/ru/qatools/school/data/Place.java @@ -6,6 +6,6 @@ /** * @author lanwen (Merkushev Kirill) */ -public enum Place implements Matcher { +public enum Place { HOME, AT_YANDEX} diff --git a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java index 4b6abfe..bcf68cd 100644 --- a/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java +++ b/steps-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -18,13 +18,13 @@ private UserSteps() { public static UserSteps user() { return new UserSteps(); } - + public UserSteps goTo(Place place) { this.place = place; return this; } - public UserSteps expectSameLocation(Place place){ + public UserSteps expectSameLocation(Place place) { assertThat("this locations is not same", this.place, is(place)); return this; From ebabdbb1cb3bf2181e347a0697f975a2aceb3921 Mon Sep 17 00:00:00 2001 From: rumm Date: Mon, 11 Apr 2016 15:51:26 +0300 Subject: [PATCH 7/7] added author name & module name --- commons-module/pom.xml | 1 + commons-module/src/test/java/school/MyFirstTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/commons-module/pom.xml b/commons-module/pom.xml index 09f52b4..fe70c7e 100644 --- a/commons-module/pom.xml +++ b/commons-module/pom.xml @@ -10,6 +10,7 @@ 4.0.0 commons-module + Module of Test diff --git a/commons-module/src/test/java/school/MyFirstTest.java b/commons-module/src/test/java/school/MyFirstTest.java index 682deaa..2d96eca 100644 --- a/commons-module/src/test/java/school/MyFirstTest.java +++ b/commons-module/src/test/java/school/MyFirstTest.java @@ -6,6 +6,7 @@ /** * @author lanwen (Merkushev Kirill) + * @author arrumm (Arkhipov Roman) */ public class MyFirstTest {