From 63f56003ceede7acac524c29727009d037d70d83 Mon Sep 17 00:00:00 2001 From: nastis Date: Thu, 7 Apr 2016 21:03:30 +0300 Subject: [PATCH 1/3] set up environment --- common-module/pom.xml | 26 +++++++++++++++++++ .../java/ru/qatools/school/data/Place.java | 9 +++++++ .../ru/qatools/school/steps/UserSteps.java | 23 ++++++++++++++++ .../java/ru/qatools/school/MyFirstTest.java | 14 ++++++++++ meta | 2 ++ pom.xml | 6 ++++- 6 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 common-module/pom.xml create mode 100644 common-module/src/main/java/ru/qatools/school/data/Place.java create mode 100644 common-module/src/main/java/ru/qatools/school/steps/UserSteps.java create mode 100644 common-module/src/test/java/ru/qatools/school/MyFirstTest.java create mode 100644 meta diff --git a/common-module/pom.xml b/common-module/pom.xml new file mode 100644 index 0000000..a06d257 --- /dev/null +++ b/common-module/pom.xml @@ -0,0 +1,26 @@ + + + + school-2016 + ru.qatools.school + 1.0-SNAPSHOT + + + 4.0.0 + jar + + steps-module + Logic Module + + + + ru.qatools.school + steps-module + ${project.version} + + + + + \ No newline at end of file diff --git a/common-module/src/main/java/ru/qatools/school/data/Place.java b/common-module/src/main/java/ru/qatools/school/data/Place.java new file mode 100644 index 0000000..5dd0641 --- /dev/null +++ b/common-module/src/main/java/ru/qatools/school/data/Place.java @@ -0,0 +1,9 @@ +package main.java.ru.qatools.school.data; + +/** + * @author lanwen (Merkushev Kirill) + */ +public enum Place { + HOME, + AT_YANDEX +} diff --git a/common-module/src/main/java/ru/qatools/school/steps/UserSteps.java b/common-module/src/main/java/ru/qatools/school/steps/UserSteps.java new file mode 100644 index 0000000..e4950bf --- /dev/null +++ b/common-module/src/main/java/ru/qatools/school/steps/UserSteps.java @@ -0,0 +1,23 @@ +package main.java.ru.qatools.school.steps; + +import main.java.ru.qatools.school.data.Place; + +/** + * @author lanwen (Merkushev Kirill) + */ +public class UserSteps { + + private Place place; + + private UserSteps() { + } + + public static UserSteps user() { + return new UserSteps(); + } + + public UserSteps goTo(Place place) { + this.place = place; + return this; + } +} diff --git a/common-module/src/test/java/ru/qatools/school/MyFirstTest.java b/common-module/src/test/java/ru/qatools/school/MyFirstTest.java new file mode 100644 index 0000000..31b3918 --- /dev/null +++ b/common-module/src/test/java/ru/qatools/school/MyFirstTest.java @@ -0,0 +1,14 @@ +package test.java.ru.qatools.school; + +import static main.java.ru.qatools.school.steps.UserSteps.user; + +/** + * @author lanwen (Merkushev Kirill) + */ +public class MyFirstTest { + + public void test() { + user().goTo(null); + } + +} diff --git a/meta b/meta new file mode 100644 index 0000000..6152f26 --- /dev/null +++ b/meta @@ -0,0 +1,2 @@ +https://github.com/autoschool/autoschool.github.io/blob/master/shtya16/02-gimme-your-first-autotest.md +https://github.com/nastis/practice2016 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 206b663..3376257 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,11 @@ First automation project ever - + + junit + junit + 4.12 + \ No newline at end of file From f19383391288dbae43292d14e0ac54b6c8ab0683 Mon Sep 17 00:00:00 2001 From: nastis Date: Mon, 11 Apr 2016 23:12:03 +0300 Subject: [PATCH 2/3] updated UserSteps class with getter; added 3 tests to MyFirstTestClass class --- common-module/pom.xml | 13 ++++++--- .../java/ru/qatools/school/MyFirstTest.java | 27 +++++++++++++++---- pom.xml | 24 ++++++++++------- steps-module/pom.xml | 10 +++++-- .../ru/qatools/school/steps/UserSteps.java | 4 +++ .../java/ru/qatools/school/MyFirstTest.java | 14 ---------- 6 files changed, 57 insertions(+), 35 deletions(-) delete mode 100644 steps-module/src/test/java/ru/qatools/school/MyFirstTest.java diff --git a/common-module/pom.xml b/common-module/pom.xml index a06d257..ca9e0bf 100644 --- a/common-module/pom.xml +++ b/common-module/pom.xml @@ -7,12 +7,12 @@ ru.qatools.school 1.0-SNAPSHOT - + 4.0.0 jar - - steps-module - Logic Module + + common-module + Common Module @@ -20,6 +20,11 @@ steps-module ${project.version} + + + junit + junit + diff --git a/common-module/src/test/java/ru/qatools/school/MyFirstTest.java b/common-module/src/test/java/ru/qatools/school/MyFirstTest.java index 31b3918..11b36ae 100644 --- a/common-module/src/test/java/ru/qatools/school/MyFirstTest.java +++ b/common-module/src/test/java/ru/qatools/school/MyFirstTest.java @@ -1,14 +1,31 @@ -package test.java.ru.qatools.school; +package ru.qatools.school; -import static main.java.ru.qatools.school.steps.UserSteps.user; +import org.junit.Assert; +import org.junit.Test; +import ru.qatools.school.data.Place; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static ru.qatools.school.steps.UserSteps.user; /** * @author lanwen (Merkushev Kirill) */ public class MyFirstTest { - - public void test() { - user().goTo(null); + + @Test + public void shouldSeeNull() { + Assert.assertThat(user().goTo(null).getPlace(), is(equalTo(null))); + } + + @Test + public void shouldSeeHome() { + Assert.assertThat(user().goTo(Place.HOME).getPlace(), is(equalTo(Place.HOME))); + } + + @Test + public void shouldSeeYandex() { + Assert.assertThat(user().goTo(Place.AT_YANDEX).getPlace(), is(equalTo(Place.AT_YANDEX))); } } diff --git a/pom.xml b/pom.xml index 3376257..4183e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -8,20 +8,24 @@ school-2016 pom 1.0-SNAPSHOT - + steps-module + common-module Automation Foreva First automation project ever - - - - junit - junit - 4.12 - - - + + + + + junit + junit + 4.12 + test + + + + \ No newline at end of file diff --git a/steps-module/pom.xml b/steps-module/pom.xml index fa52f60..30b4f03 100644 --- a/steps-module/pom.xml +++ b/steps-module/pom.xml @@ -7,12 +7,18 @@ ru.qatools.school 1.0-SNAPSHOT - + 4.0.0 jar - + steps-module Logic Module + + + junit + junit + + \ No newline at end of file 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..b2c0c97 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 @@ -20,4 +20,8 @@ public UserSteps goTo(Place place) { this.place = place; return this; } + + public Place getPlace() { + return place; + } } diff --git a/steps-module/src/test/java/ru/qatools/school/MyFirstTest.java b/steps-module/src/test/java/ru/qatools/school/MyFirstTest.java deleted file mode 100644 index 5378485..0000000 --- a/steps-module/src/test/java/ru/qatools/school/MyFirstTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package ru.qatools.school; - -import static ru.qatools.school.steps.UserSteps.user; - -/** - * @author lanwen (Merkushev Kirill) - */ -public class MyFirstTest { - - public void test() { - user().goTo(null); - } - -} From 1916be25e000f254d734e25f3269a6b83cb2c654 Mon Sep 17 00:00:00 2001 From: nastis Date: Tue, 10 May 2016 03:14:23 +0300 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 69e007d..946ce1e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# DOcker repo reference: +https://github.com/nastis/Mydocker + + # Practice of automation school 2016 See all info in repo [autoschool/autoschool.github.io](https://github.com/autoschool/autoschool.github.io)