Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure all tests are executed in the Gradle build

Browse Source 
Prior to this commit several test classes named "*Test" were not
recognized as tests by the Gradle build. This is due to the configured
inclusion of '**/*Tests.*' which follows Spring's naming convention for
test classes.

This commit addresses this issue by:

 - Renaming real test classes consistently to "*Tests".
 - Renaming internal test classes to "*TestCase".
 - Renaming @WebTest to @WebTestStereotype.
 - Disabling broken tests in AnnoDrivenStaticEntityMockingControlTest.
 - Modifying the Gradle build configuration so that classes ending in
   either "*Tests" or "*Test" are considered test classes.

Issue: SPR-11384
This commit is contained in:
Sam Brannen
2014-02-03 23:16:47 +01:00
parent 1c5cab2a40
commit b8ed2f4967
18 changed files with 198 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java → spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import java.sql.Connection;
import javax.sql.DataSource;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
@@ -31,20 +30,14 @@ import static org.mockito.BDDMockito.*;
/**
* Tests for {@link DelegatingDataSource}.
*
*
* @author Phillip Webb
*/
public class DelegatingDataSourceTest {
public class DelegatingDataSourceTests {
private DataSource delegate;
private final DataSource delegate = mock(DataSource.class);
private DelegatingDataSource dataSource;
@Before
public void setup() {
this.delegate = mock(DataSource.class);
this.dataSource = new DelegatingDataSource(delegate);
}
private DelegatingDataSource dataSource = new DelegatingDataSource(delegate);
@Test
public void shouldDelegateGetConnection() throws Exception {