WhenAnyUserAtAnyPage(checkStandardStructure): remove empty method.

php-coder · php-coder · commit 29f594f92c0b · 2017-02-12T23:01:00.000+01:00
No functional changes.
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAdminAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAdminAtIndexPage.java
@@ -52,45 +52,40 @@ public void tearDown() {
 		page.logout();
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsWelcomeText() {
 		assertThat(page.textPresent(tr("t_you_may"))).isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForAddingSeries() {
 		assertThat(page.linkWithLabelExists(tr("t_add_series")))
 			.overridingErrorMessage("should exists link to page for adding series of stamps")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForAddingCountries() {
 		assertThat(page.linkWithLabelExists(tr("t_add_country")))
 			.overridingErrorMessage("should exists link to page for adding countries")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCountries() {
 		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
 			.overridingErrorMessage("should exists link to page for listing countries")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForAddingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_create_category")))
 			.overridingErrorMessage("should exists link to page for adding categories")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_show_categories_list")))
 			.overridingErrorMessage("should exists link to page for listing categories")
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtForbiddenPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtForbiddenPage.java
@@ -40,17 +40,12 @@ public void setUp() {
 		page.open(Url.FORBIDDEN_PAGE);
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorMessage() {
 		assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorCode() {
 		assertThat(page.getErrorCode()).isEqualTo("403");
 	}
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserAtIndexPage.java
@@ -37,45 +37,40 @@ public void setUp() {
 		page.open();
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsWelcomeText() {
 		assertThat(page.textPresent(tr("t_you_may"))).isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_show_categories_list")))
 			.overridingErrorMessage("should exists link to page for listing categories")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCountries() {
 		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
 			.overridingErrorMessage("should exists link to page for listing countries")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void linkForAddingSeriesShouldBeAbsent() {
 		assertThat(page.linkWithLabelExists(tr("t_add_series")))
 			.overridingErrorMessage("should absent link to page for adding series of stamps")
 			.isFalse();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void linkForAddingCategoriesShouldBeAbsent() {
 		assertThat(page.linkWithLabelExists(tr("t_create_category")))
 			.overridingErrorMessage("should absent link to page for adding categories")
 			.isFalse();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void linkForAddingCountriesShouldBeAbsent() {
 		assertThat(page.linkWithLabelExists(tr("t_add_country")))
 			.overridingErrorMessage("should absent link to page for adding countries")
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingCollectionPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingCollectionPage.java
@@ -38,8 +38,6 @@ public void shouldShow404Page() {
 		String url = Url.INFO_COLLECTION_PAGE.replace("{slug}", "collection-404-error-test");
 		page.open(url);
 
-		checkStandardStructure();
-
 		assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));
 		assertThat(page.getErrorCode()).isEqualTo("404");
 	}
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingPage.java
@@ -37,22 +37,17 @@ public void setUp() {
 		page.open();
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorMessage() {
 		assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorCode() {
 		assertThat(page.getErrorCode()).isEqualTo("404");
 	}
 	
-	@Test(groups = "logic", dependsOnGroups = "std", enabled = false)
+	@Test(groups = "logic", enabled = false)
 	public void incidentShouldBeLoggedToDatabase() {
 		// TODO: check suspicious_activities table (#99)
 	}
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenTogglzConsole.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenTogglzConsole.java
@@ -38,17 +38,12 @@ public void setUp() {
 		page.open(Url.TOGGLZ_CONSOLE_PAGE);
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorMessage() {
 		assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorCode() {
 		assertThat(page.getErrorCode()).isEqualTo("403");
 	}
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPage.java
@@ -44,7 +44,4 @@ abstract class WhenAnyUserAtAnyPage<T extends AbstractPage>
 		page = PageFactory.initElements(WebDriverFactory.getDriver(), pageClass);
 	}
 	
-	protected void checkStandardStructure() {
-	}
-	
 }
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPageWithForm.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnyUserAtAnyPageWithForm.java
@@ -35,10 +35,7 @@ abstract class WhenAnyUserAtAnyPageWithForm<T extends AbstractPageWithForm>
 		super(pageClass);
 	}
 	
-	@Override
 	protected void checkStandardStructure() {
-		super.checkStandardStructure();
-		
 		shouldHaveForm();
 		shouldHaveFields();
 		shouldHaveLabels();
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenUserAtIndexPage.java b/src/test/java/ru/mystamps/web/tests/cases/WhenUserAtIndexPage.java
@@ -52,45 +52,40 @@ public void tearDown() {
 		page.logout();
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsWelcomeText() {
 		assertThat(page.textPresent(tr("t_you_may"))).isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForAddingSeries() {
 		assertThat(page.linkWithLabelExists(tr("t_add_series")))
 			.overridingErrorMessage("should exists link to page for adding series of stamps")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistLinkForAddingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_create_category")))
 			.overridingErrorMessage("should exist link to page for adding categories")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCategories() {
 		assertThat(page.linkWithLabelExists(tr("t_show_categories_list")))
 			.overridingErrorMessage("should exists link to page for listing categories")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistLinkForAddingCountries() {
 		assertThat(page.linkWithLabelExists(tr("t_add_country")))
 			.overridingErrorMessage("should exist link to page for adding countries")
 			.isTrue();
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsLinkForListingCountries() {
 		assertThat(page.linkWithLabelExists(tr("t_show_countries_list")))
 			.overridingErrorMessage("should exists link to page for listing countries")
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenUserOpenTogglzConsole.java b/src/test/java/ru/mystamps/web/tests/cases/WhenUserOpenTogglzConsole.java
@@ -53,17 +53,12 @@ public void tearDown() {
 		page.logout();
 	}
 	
-	@Test(groups = "std")
-	public void shouldHaveStandardStructure() {
-		checkStandardStructure();
-	}
-	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorMessage() {
 		assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));
 	}
 	
-	@Test(groups = "misc", dependsOnGroups = "std")
+	@Test(groups = "misc")
 	public void shouldExistsErrorCode() {
 		assertThat(page.getErrorCode()).isEqualTo("403");
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,17 +40,12 @@ public void setUp() {`
`40`	`40`	`page.open(Url.FORBIDDEN_PAGE);`
`41`	`41`	`}`
`42`	`42`
`43`		`- @Test(groups = "std")`
`44`		`- public void shouldHaveStandardStructure() {`
`45`		`- checkStandardStructure();`
`46`		`- }`
`47`		`-`
`48`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`43`	`+ @Test(groups = "misc")`
`49`	`44`	`public void shouldExistsErrorMessage() {`
`50`	`45`	`assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));`
`51`	`46`	`}`
`52`	`47`
`53`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`48`	`+ @Test(groups = "misc")`
`54`	`49`	`public void shouldExistsErrorCode() {`
`55`	`50`	`assertThat(page.getErrorCode()).isEqualTo("403");`
`56`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ public void shouldShow404Page() {`
`38`	`38`	`String url = Url.INFO_COLLECTION_PAGE.replace("{slug}", "collection-404-error-test");`
`39`	`39`	`page.open(url);`
`40`	`40`
`41`		`- checkStandardStructure();`
`42`		`-`
`43`	`41`	`assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));`
`44`	`42`	`assertThat(page.getErrorCode()).isEqualTo("404");`
`45`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,22 +37,17 @@ public void setUp() {`
`37`	`37`	`page.open();`
`38`	`38`	`}`
`39`	`39`
`40`		`- @Test(groups = "std")`
`41`		`- public void shouldHaveStandardStructure() {`
`42`		`- checkStandardStructure();`
`43`		`- }`
`44`		`-`
`45`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`40`	`+ @Test(groups = "misc")`
`46`	`41`	`public void shouldExistsErrorMessage() {`
`47`	`42`	`assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));`
`48`	`43`	`}`
`49`	`44`
`50`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`45`	`+ @Test(groups = "misc")`
`51`	`46`	`public void shouldExistsErrorCode() {`
`52`	`47`	`assertThat(page.getErrorCode()).isEqualTo("404");`
`53`	`48`	`}`
`54`	`49`
`55`		`- @Test(groups = "logic", dependsOnGroups = "std", enabled = false)`
	`50`	`+ @Test(groups = "logic", enabled = false)`
`56`	`51`	`public void incidentShouldBeLoggedToDatabase() {`
`57`	`52`	`// TODO: check suspicious_activities table (#99)`
`58`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,12 @@ public void setUp() {`
`38`	`38`	`page.open(Url.TOGGLZ_CONSOLE_PAGE);`
`39`	`39`	`}`
`40`	`40`
`41`		`- @Test(groups = "std")`
`42`		`- public void shouldHaveStandardStructure() {`
`43`		`- checkStandardStructure();`
`44`		`- }`
`45`		`-`
`46`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`41`	`+ @Test(groups = "misc")`
`47`	`42`	`public void shouldExistsErrorMessage() {`
`48`	`43`	`assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));`
`49`	`44`	`}`
`50`	`45`
`51`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`46`	`+ @Test(groups = "misc")`
`52`	`47`	`public void shouldExistsErrorCode() {`
`53`	`48`	`assertThat(page.getErrorCode()).isEqualTo("403");`
`54`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,4 @@ abstract class WhenAnyUserAtAnyPage<T extends AbstractPage>`
`44`	`44`	`page = PageFactory.initElements(WebDriverFactory.getDriver(), pageClass);`
`45`	`45`	`}`
`46`	`46`
`47`		`- protected void checkStandardStructure() {`
`48`		`- }`
`49`		`-`
`50`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,12 @@ public void tearDown() {`
`53`	`53`	`page.logout();`
`54`	`54`	`}`
`55`	`55`
`56`		`- @Test(groups = "std")`
`57`		`- public void shouldHaveStandardStructure() {`
`58`		`- checkStandardStructure();`
`59`		`- }`
`60`		`-`
`61`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`56`	`+ @Test(groups = "misc")`
`62`	`57`	`public void shouldExistsErrorMessage() {`
`63`	`58`	`assertThat(page.getErrorMessage()).isEqualTo(tr("t_403_description"));`
`64`	`59`	`}`
`65`	`60`
`66`		`- @Test(groups = "misc", dependsOnGroups = "std")`
	`61`	`+ @Test(groups = "misc")`
`67`	`62`	`public void shouldExistsErrorCode() {`
`68`	`63`	`assertThat(page.getErrorCode()).isEqualTo("403");`
`69`	`64`	`}`