diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTests.java similarity index 91% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTests.java index c282f1e31..211369446 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/AttachEntityTests.java @@ -27,9 +27,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class AttachEntityTest extends EntityTestBase { +public class AttachEntityTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTests.java index 04afc9888..1cb6dd199 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/DynamicPropertiesTests.java @@ -40,8 +40,8 @@ import static org.junit.Assert.assertFalse; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) -public class DynamicPropertiesTest extends EntityTestBase { +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) +public class DynamicPropertiesTests extends EntityTestBase { @Autowired private Neo4jTemplate template; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTests.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTests.java index bcff163ff..4c4d0e58f 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityPropertyValidationTests.java @@ -34,9 +34,9 @@ import javax.validation.ValidationException; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class EntityPropertyValidationTest extends EntityTestBase { +public class EntityPropertyValidationTests extends EntityTestBase { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTests.java similarity index 96% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTests.java index 510248947..3be1c2410 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/EntityWithoutAspectSetupTests.java @@ -21,7 +21,7 @@ import org.springframework.data.neo4j.aspects.Person; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class EntityWithoutAspectSetupTest { +public class EntityWithoutAspectSetupTests { @Test public void testEquals() throws Exception { final Person p1 = new Person(); diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java index 38900aea2..49fea20cb 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/FinderTests.java @@ -39,8 +39,8 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) -public class FinderTest extends EntityTestBase { +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) +public class FinderTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java index 845876440..b60ad942a 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/GraphRepositoryTests.java @@ -47,7 +47,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/repository-namespace-config-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class GraphRepositoryTest extends EntityTestBase { +public class GraphRepositoryTests extends EntityTestBase { @Before public void setUp() throws Exception { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTests.java similarity index 99% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTests.java index a421097ef..5e2c36b1e 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTests.java @@ -54,10 +54,10 @@ import static org.springframework.data.neo4j.aspects.Person.NAME_INDEX; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) //@TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class IndexTest extends EntityTestBase { +public class IndexTests extends EntityTestBase { private static final String NAME = "name"; private static final String NAME_VALUE = "aName"; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTests.java index 3daaaa7e1..3db1f7090 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ModificationOutsideOfTransactionTests.java @@ -39,8 +39,8 @@ import static org.springframework.data.neo4j.aspects.support.HasRelationshipMatc import static org.springframework.data.neo4j.aspects.support.HasRelationshipMatcher.hasRelationship; @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"} ) -public class ModificationOutsideOfTransactionTest extends EntityTestBase { +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"} ) +public class ModificationOutsideOfTransactionTests extends EntityTestBase { @Before public void cleanUp() { diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTests.java similarity index 96% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTests.java index 81f316284..4a5e6a4a9 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityInstantiationTests.java @@ -35,11 +35,11 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { - "classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:org/springframework/data/neo4j/aspects/support/PersonDirectCreator-context.xml" }) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class NodeEntityInstantiationTest extends EntityTestBase { +public class NodeEntityInstantiationTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTests.java similarity index 95% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTests.java index 786aedd8f..85dc17024 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityQueryTests.java @@ -39,9 +39,9 @@ import static org.junit.internal.matchers.IsCollectionContaining.hasItems; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) @Transactional -public class NodeEntityQueryTest extends EntityTestBase { +public class NodeEntityQueryTests extends EntityTestBase { private TestTeam testTeam; private Person michael; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTests.java similarity index 99% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTests.java index ec9219e20..9c5c3033c 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityRelationshipTests.java @@ -48,9 +48,9 @@ import static org.junit.Assert.assertTrue; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class NodeEntityRelationshipTest extends EntityTestBase { +public class NodeEntityRelationshipTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTests.java index 110443e40..5ca2c980b 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/NodeEntityTests.java @@ -41,9 +41,9 @@ import static org.junit.Assert.fail; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class NodeEntityTest extends EntityTestBase { +public class NodeEntityTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTests.java similarity index 92% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTests.java index 196e1478e..904e2e8b6 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/ProjectionTests.java @@ -27,9 +27,9 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class ProjectionTest extends EntityTestBase { +public class ProjectionTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTests.java similarity index 97% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTests.java index 9ddb73b20..f27a7c4b5 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/PropertyTests.java @@ -34,9 +34,9 @@ import static org.junit.Assert.assertEquals; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class PropertyTest extends EntityTestBase { +public class PropertyTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTests.java index f84e35b4e..18bffc2df 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/RelationshipEntityTests.java @@ -33,9 +33,9 @@ import static org.junit.Assert.*; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class RelationshipEntityTest extends EntityTestBase { +public class RelationshipEntityTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTests.java similarity index 97% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTests.java index 95e6865a7..7abda52f4 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/TraversalTests.java @@ -41,9 +41,9 @@ import static org.junit.Assert.assertEquals; import static org.springframework.data.neo4j.aspects.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) -public class TraversalTest extends EntityTestBase { +public class TraversalTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTests.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTests.java index 98eb08e10..19ebab2ae 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityMapperTests.java @@ -33,8 +33,8 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) -public class EntityMapperTest extends EntityTestBase { +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) +public class EntityMapperTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTests.java similarity index 94% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTests.java index c9f0ae657..a395e38d0 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/EntityPathTests.java @@ -34,8 +34,8 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) -public class EntityPathTest extends EntityTestBase { +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) +public class EntityPathTests extends EntityTestBase { @Test @Transactional diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTests.java index 03c3765cf..b4d22f523 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/path/PathMappingIteratorTests.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; * @author mh * @since 22.02.11 */ -public class PathMappingIteratorTest extends EntityTestBase { +public class PathMappingIteratorTests extends EntityTestBase { private static final int PATHS_COUNT = 3; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTests.java similarity index 95% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTests.java index 7b4a01a40..5198d7643 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/GremlinQueryEngineTests.java @@ -42,9 +42,9 @@ import static org.junit.Assert.assertEquals; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) @Transactional -public class GremlinQueryEngineTest extends EntityTestBase { +public class GremlinQueryEngineTests extends EntityTestBase { private QueryEngine queryEngine; private Person michael; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTests.java index 225e8c134..179641cbc 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/query/QueryEngineTests.java @@ -56,9 +56,9 @@ import static org.neo4j.helpers.collection.MapUtil.map; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml"}) @Transactional -public class QueryEngineTest extends EntityTestBase { +public class QueryEngineTests extends EntityTestBase { @Autowired protected ConversionService conversionService; @Autowired diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTests.java index 3b848620f..2f06fb386 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingNodeTypeRepresentationStrategyTests.java @@ -48,10 +48,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class IndexingNodeTypeRepresentationStrategyTest extends EntityTestBase { +public class IndexingNodeTypeRepresentationStrategyTests extends EntityTestBase { @Autowired private IndexingNodeTypeRepresentationStrategy nodeTypeRepresentationStrategy; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTests.java similarity index 97% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTests.java index 07e4ee222..4916161fb 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategyTests.java @@ -50,10 +50,10 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; import static org.neo4j.helpers.collection.IteratorUtil.first; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:org/springframework/data/neo4j/aspects/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class IndexingRelationshipTypeRepresentationStrategyTest extends EntityTestBase { +public class IndexingRelationshipTypeRepresentationStrategyTests extends EntityTestBase { @Autowired private IndexingRelationshipTypeRepresentationStrategy relationshipTypeRepresentationStrategy; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTests.java similarity index 97% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTests.java index 27033c7d8..de59d871a 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/NoopTypeRepresentationStrategyTests.java @@ -39,10 +39,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:org/springframework/data/neo4j/aspects/support/NoopTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class NoopTypeRepresentationStrategyTest extends EntityTestBase { +public class NoopTypeRepresentationStrategyTests extends EntityTestBase { @Autowired private NoopNodeTypeRepresentationStrategy noopNodeStrategy; diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTests.java similarity index 98% rename from spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTests.java index 6e1308454..0e13aa8a2 100644 --- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategyTests.java @@ -54,10 +54,10 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson; * @since 20.01.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:org/springframework/data/neo4j/aspects/support/SubReferenceTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class SubReferenceNodeTypeRepresentationStrategyTest extends EntityTestBase { +public class SubReferenceNodeTypeRepresentationStrategyTests extends EntityTestBase { @Autowired private SubReferenceNodeTypeRepresentationStrategy nodeTypeRepresentationStrategy; diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml similarity index 100% rename from spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml rename to spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTest.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTests.java similarity index 97% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTest.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTests.java index 47d2d29c9..8bbbbb3aa 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTest.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerCrossStoreTests.java @@ -36,7 +36,7 @@ import java.io.File; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml") -public class DataGraphNamespaceHandlerCrossStoreTest { +public class DataGraphNamespaceHandlerCrossStoreTests { @Autowired GraphDatabaseService graphDatabaseService; @Autowired Neo4jTemplate template; diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTest.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTests.java similarity index 95% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTest.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTests.java index 6be1a51a6..17ff3fe51 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTest.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationConfigTests.java @@ -26,5 +26,5 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context-config.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RecommendationConfigTest extends RecommendationTest { +public class RecommendationConfigTests extends RecommendationTests { } diff --git a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTests.java similarity index 97% rename from spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java rename to spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTests.java index d32689ccf..e9c1e1203 100644 --- a/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java +++ b/spring-data-neo4j-cross-store/src/test/java/org/springframework/data/neo4j/partial/RecommendationTests.java @@ -40,9 +40,9 @@ import javax.persistence.PersistenceContext; import javax.sql.DataSource; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RecommendationTest { +public class RecommendationTests { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml b/spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTests-context.xml similarity index 100% rename from spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml rename to spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTests-context.xml diff --git a/spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTest.java b/spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTests.java similarity index 96% rename from spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTest.java rename to spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTests.java index 0d24208bc..d935d9829 100644 --- a/spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTest.java +++ b/spring-data-neo4j-examples/backwardscompatibility/src/test/java/backwardscompatibility/BackwardsCompatibilityTests.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration(locations = "classpath:/backwardscompatibility.xml") @RunWith(SpringJUnit4ClassRunner.class) @Transactional -public class BackwardsCompatibilityTest +public class BackwardsCompatibilityTests { @Autowired private Neo4jTemplate template; diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTests.java similarity index 99% rename from spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java rename to spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTests.java index 8150ebb9e..5b8d4c169 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java +++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class DomainTest { +public class DomainTests { @Autowired protected MovieRepository movieRepository; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java similarity index 94% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java rename to spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java index 0f1dc4b8f..451be3790 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java +++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; * @since 13.03.11 */ @Ignore -public class MovieDbApiClientTest { +public class MovieDbApiClientTests { private static final String API_KEY = "926d2a79e82920b62f03b1cb57e532e6"; @Test diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java similarity index 97% rename from spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java rename to spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java index 7cc261452..966a3b5fc 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java +++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class MovieDbImportServiceTest { +public class MovieDbImportServiceTests { @Autowired MovieDbImportService importService; diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java rename to spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java index 54bc6279b..9d11b84bf 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java +++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; * @author mh * @since 13.03.11 */ -public class MovieDbLocalStorageTest { +public class MovieDbLocalStorageTests { private static final String ID = "111"; diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java similarity index 99% rename from spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java rename to spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java index 9f7b27851..627ede915 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java +++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class MoviesRepositoryTest { +public class MoviesRepositoryTests { @Autowired MovieRepository movieRepository; diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java rename to spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTests.java index 68ca111ee..751d5add6 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/domain/DomainTests.java @@ -21,7 +21,7 @@ import static org.junit.matchers.JUnitMatchers.hasItem; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class DomainTest extends RestTestBase { +public class DomainTests extends RestTestBase { @Autowired protected MovieRepository movieRepository; diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java similarity index 94% rename from spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java rename to spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java index 0f1dc4b8f..451be3790 100644 --- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; * @since 13.03.11 */ @Ignore -public class MovieDbApiClientTest { +public class MovieDbApiClientTests { private static final String API_KEY = "926d2a79e82920b62f03b1cb57e532e6"; @Test diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java similarity index 96% rename from spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java rename to spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java index 1aa3c62ec..8e7b44daf 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration({"/movies-test-context.xml"}) @Transactional @Ignore("Should not be run nilly-willy - talks with http://api.themoviedb.org") -public class MovieDbImportServiceTest extends RestTestBase { +public class MovieDbImportServiceTests extends RestTestBase { @Autowired MovieDbImportService importService; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java rename to spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java index 54bc6279b..9d11b84bf 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; * @author mh * @since 13.03.11 */ -public class MovieDbLocalStorageTest { +public class MovieDbLocalStorageTests { private static final String ID = "111"; diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java similarity index 97% rename from spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java rename to spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java index e73e0b162..74d1d7b9d 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java +++ b/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java @@ -28,7 +28,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @RunWith( SpringJUnit4ClassRunner.class ) @ContextConfiguration( { "/movies-test-context.xml" } ) @Transactional -public class MoviesRepositoryTest extends RestTestBase { +public class MoviesRepositoryTests extends RestTestBase { @Autowired CineastsRepository repository; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTests.java similarity index 99% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTests.java index f9f325cd6..c93eb75bc 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/domain/DomainTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class DomainTest { +public class DomainTests { @Autowired protected MovieRepository movieRepository; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java index cbdab37ac..f65ecf3d0 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/integrationtests/DatabasePopulationIT.java @@ -5,6 +5,7 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; import org.hamcrest.Matchers; +import org.junit.Ignore; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -13,6 +14,7 @@ import java.io.IOException; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; +@Ignore("slow test") public class DatabasePopulationIT { @Test public void shouldPopulateDatabase() throws Exception { diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java similarity index 94% rename from spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java index 0f1dc4b8f..451be3790 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbApiClientTests.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; * @since 13.03.11 */ @Ignore -public class MovieDbApiClientTest { +public class MovieDbApiClientTests { private static final String API_KEY = "926d2a79e82920b62f03b1cb57e532e6"; @Test diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java index 568250107..7421d9da8 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbImportServiceTests.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class MovieDbImportServiceTest { +public class MovieDbImportServiceTests { @Autowired MovieDbImportService importService; diff --git a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java index 54bc6279b..9d11b84bf 100644 --- a/spring-data-neo4j-examples/cineasts-rest/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/movieimport/MovieDbLocalStorageTests.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; * @author mh * @since 13.03.11 */ -public class MovieDbLocalStorageTest { +public class MovieDbLocalStorageTests { private static final String ID = "111"; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java similarity index 99% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java index 37eaf5178..c7211786e 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/MoviesRepositoryTests.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @Transactional -public class MoviesRepositoryTest { +public class MoviesRepositoryTests { @Autowired MovieRepository movieRepository; @Autowired UserRepository userRepository; @Autowired Neo4jOperations template; diff --git a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTest.java b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTests.java similarity index 98% rename from spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTest.java rename to spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTests.java index f59859251..c8fb67fdc 100644 --- a/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTest.java +++ b/spring-data-neo4j-examples/cineasts/src/test/java/org/neo4j/cineasts/service/TransactionTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"/movies-test-context.xml"}) @DirtiesContext -public class TransactionTest { +public class TransactionTests { @Autowired UserRepository userRepository; diff --git a/spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTest.java b/spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTests.java similarity index 96% rename from spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTest.java rename to spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTests.java index 76cce92ff..99c7edfeb 100644 --- a/spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTest.java +++ b/spring-data-neo4j-examples/hello-worlds/src/test/java/org/springframework/data/neo4j/examples/hellograph/GalaxyServiceTests.java @@ -1,119 +1,119 @@ -package org.springframework.data.neo4j.examples.hellograph; - -import static org.hamcrest.CoreMatchers.anyOf; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; -import static org.junit.internal.matchers.StringContains.containsString; - -import java.util.Collection; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.support.Neo4jTemplate; -import org.springframework.data.neo4j.support.node.Neo4jHelper; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.transaction.BeforeTransaction; -import org.springframework.transaction.annotation.Transactional; - -@ContextConfiguration(locations = "classpath:/spring/helloWorldContext.xml") -@RunWith(SpringJUnit4ClassRunner.class) -@Transactional -public class GalaxyServiceTest { - - @Autowired - private GalaxyService galaxyService; - - @Autowired - private Neo4jTemplate template; - - @Rollback(false) - @BeforeTransaction - public void cleanUpGraph() { - Neo4jHelper.cleanDb(template); - } - - @Test - public void shouldAllowDirectWorldCreation() { - assertEquals(0, galaxyService.getNumberOfWorlds()); - World myWorld = galaxyService.createWorld("mine", 0); - assertEquals(1, galaxyService.getNumberOfWorlds()); - - Iterable foundWorlds = galaxyService.getAllWorlds(); - World mine = foundWorlds.iterator().next(); - assertEquals(myWorld.getName(), mine.getName()); - } - - @Test - public void shouldHaveCorrectNumberOfWorlds() { - galaxyService.makeSomeWorlds(); - assertEquals(13, galaxyService.getNumberOfWorlds()); - } - - @Test - public void shouldFindWorldsById() { - galaxyService.makeSomeWorlds(); - - for(World world : galaxyService.getAllWorlds()) { - World foundWorld = galaxyService.findWorldById(world.getId()); - assertNotNull(foundWorld); - } - } - - @Test - public void shouldFindWorldsByName() { - galaxyService.makeSomeWorlds(); - - for(World world : galaxyService.getAllWorlds()) { - World foundWorld = galaxyService.findWorldByName(world.getName()); - assertNotNull(foundWorld); - } - } - - @Test - public void shouldReachMarsFromEarth() { - galaxyService.makeSomeWorlds(); - - World earth = galaxyService.findWorldByName("Earth"); - World mars = galaxyService.findWorldByName("Mars"); - - assertTrue(mars.canBeReachedFrom(earth)); - assertTrue(earth.canBeReachedFrom(mars)); - } - - @Test - public void shouldFindAllWorlds() { - Collection madeWorlds = galaxyService.makeSomeWorlds(); - Iterable foundWorlds = galaxyService.getAllWorlds(); - - int countOfFoundWorlds = 0; - for(World foundWorld : foundWorlds) { - assertTrue(madeWorlds.contains(foundWorld)); - countOfFoundWorlds++; - } - - assertEquals(madeWorlds.size(), countOfFoundWorlds); - } - - @SuppressWarnings("unchecked") - @Test - public void shouldFindWorldsWith1Moon() { - galaxyService.makeSomeWorlds(); - - for(World worldWithOneMoon : galaxyService.findAllByNumberOfMoons(1)) { - assertThat( - worldWithOneMoon.getName(), - is(anyOf(containsString("Earth"), containsString("Midgard")))); - } - } - - @Test - public void shouldNotFindKrypton() { - galaxyService.makeSomeWorlds(); - World krypton = galaxyService.findWorldByName("Krypton"); - assertNull(krypton); - } - -} +package org.springframework.data.neo4j.examples.hellograph; + +import static org.hamcrest.CoreMatchers.anyOf; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.*; +import static org.junit.internal.matchers.StringContains.containsString; + +import java.util.Collection; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.neo4j.support.Neo4jTemplate; +import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.transaction.BeforeTransaction; +import org.springframework.transaction.annotation.Transactional; + +@ContextConfiguration(locations = "classpath:/spring/helloWorldContext.xml") +@RunWith(SpringJUnit4ClassRunner.class) +@Transactional +public class GalaxyServiceTests { + + @Autowired + private GalaxyService galaxyService; + + @Autowired + private Neo4jTemplate template; + + @Rollback(false) + @BeforeTransaction + public void cleanUpGraph() { + Neo4jHelper.cleanDb(template); + } + + @Test + public void shouldAllowDirectWorldCreation() { + assertEquals(0, galaxyService.getNumberOfWorlds()); + World myWorld = galaxyService.createWorld("mine", 0); + assertEquals(1, galaxyService.getNumberOfWorlds()); + + Iterable foundWorlds = galaxyService.getAllWorlds(); + World mine = foundWorlds.iterator().next(); + assertEquals(myWorld.getName(), mine.getName()); + } + + @Test + public void shouldHaveCorrectNumberOfWorlds() { + galaxyService.makeSomeWorlds(); + assertEquals(13, galaxyService.getNumberOfWorlds()); + } + + @Test + public void shouldFindWorldsById() { + galaxyService.makeSomeWorlds(); + + for(World world : galaxyService.getAllWorlds()) { + World foundWorld = galaxyService.findWorldById(world.getId()); + assertNotNull(foundWorld); + } + } + + @Test + public void shouldFindWorldsByName() { + galaxyService.makeSomeWorlds(); + + for(World world : galaxyService.getAllWorlds()) { + World foundWorld = galaxyService.findWorldByName(world.getName()); + assertNotNull(foundWorld); + } + } + + @Test + public void shouldReachMarsFromEarth() { + galaxyService.makeSomeWorlds(); + + World earth = galaxyService.findWorldByName("Earth"); + World mars = galaxyService.findWorldByName("Mars"); + + assertTrue(mars.canBeReachedFrom(earth)); + assertTrue(earth.canBeReachedFrom(mars)); + } + + @Test + public void shouldFindAllWorlds() { + Collection madeWorlds = galaxyService.makeSomeWorlds(); + Iterable foundWorlds = galaxyService.getAllWorlds(); + + int countOfFoundWorlds = 0; + for(World foundWorld : foundWorlds) { + assertTrue(madeWorlds.contains(foundWorld)); + countOfFoundWorlds++; + } + + assertEquals(madeWorlds.size(), countOfFoundWorlds); + } + + @SuppressWarnings("unchecked") + @Test + public void shouldFindWorldsWith1Moon() { + galaxyService.makeSomeWorlds(); + + for(World worldWithOneMoon : galaxyService.findAllByNumberOfMoons(1)) { + assertThat( + worldWithOneMoon.getName(), + is(anyOf(containsString("Earth"), containsString("Midgard")))); + } + } + + @Test + public void shouldNotFindKrypton() { + galaxyService.makeSomeWorlds(); + World krypton = galaxyService.findWorldByName("Krypton"); + assertNull(krypton); + } + +} diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTests.java similarity index 98% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java rename to spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTests.java index b4698a979..43a63fac2 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTest.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/RestaurantRepositoryTests.java @@ -23,7 +23,7 @@ import java.util.List; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @DirtiesContext -public class RestaurantRepositoryTest { +public class RestaurantRepositoryTests { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTest.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTests.java similarity index 97% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTest.java rename to spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTests.java index 15aaf3593..4dc786f5f 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTest.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRelationshipsTests.java @@ -20,7 +20,7 @@ import java.util.List; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @DirtiesContext -public class UserAccountRelationshipsTest extends AbstractTestWithUserAccount { +public class UserAccountRelationshipsTests extends AbstractTestWithUserAccount { @Autowired UserAccountRepository userAccountRepo; diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTest.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTests.java similarity index 97% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTest.java rename to spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTests.java index 6f154d01b..1cc94f034 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTest.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/data/UserAccountRepositoryTests.java @@ -18,7 +18,7 @@ import java.util.List; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @DirtiesContext -public class UserAccountRepositoryTest extends AbstractTestWithUserAccount { +public class UserAccountRepositoryTests extends AbstractTestWithUserAccount { @Autowired UserAccountRepository repo; diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTest.java b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTests.java similarity index 98% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTest.java rename to spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTests.java index 763f970f1..675721d32 100644 --- a/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTest.java +++ b/spring-data-neo4j-examples/myrestaurants-social/src/test/java/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTests.java @@ -34,7 +34,7 @@ import static java.util.Arrays.asList; @ContextConfiguration @DirtiesContext @Transactional -public class TopRatedRestaurantFinderTest { +public class TopRatedRestaurantFinderTests { @Autowired private Neo4jTemplate template; diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/RestaurantRepositoryTest-context.xml b/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/RestaurantRepositoryTests-context.xml similarity index 100% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/RestaurantRepositoryTest-context.xml rename to spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/RestaurantRepositoryTests-context.xml diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRelationshipsTest-context.xml b/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRelationshipsTests-context.xml similarity index 100% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRelationshipsTest-context.xml rename to spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRelationshipsTests-context.xml diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRepositoryTest-context.xml b/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRepositoryTests-context.xml similarity index 100% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRepositoryTest-context.xml rename to spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/data/UserAccountRepositoryTests-context.xml diff --git a/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTest-context.xml b/spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTests-context.xml similarity index 100% rename from spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTest-context.xml rename to spring-data-neo4j-examples/myrestaurants-social/src/test/resources/com/springone/myrestaurants/domain/TopRatedRestaurantFinderTests-context.xml diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java similarity index 90% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java index 8032cde67..3f8226e71 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.EntityPropertyValidationTest; +import org.springframework.data.neo4j.aspects.support.EntityPropertyValidationTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestEntityPropertyValidationTest extends EntityPropertyValidationTest { +public class RestEntityPropertyValidationTests extends EntityPropertyValidationTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java index 6c1c9d7e8..c1843597e 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.FinderTest; +import org.springframework.data.neo4j.aspects.support.FinderTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestFinderTest extends FinderTest { +public class RestFinderTests extends FinderTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java similarity index 89% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java index a7f8cdde0..32c58edf2 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.IndexTest; +import org.springframework.data.neo4j.aspects.support.IndexTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.CleanContextCacheTestExecutionListener; @@ -35,10 +35,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) -public class RestIndexTest extends IndexTest { +public class RestIndexTests extends IndexTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTests.java similarity index 96% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTests.java index 10ce43972..3ce09ee8e 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTests.java @@ -27,11 +27,11 @@ import org.springframework.dao.DataAccessException; import org.springframework.data.neo4j.config.NullTransactionManager; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.support.RestTestHelper; -import org.springframework.data.neo4j.template.Neo4jTemplateApiTest; +import org.springframework.data.neo4j.template.Neo4jTemplateApiTests; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; -public class RestNeo4jTemplateApiTest extends Neo4jTemplateApiTest +public class RestNeo4jTemplateApiTests extends Neo4jTemplateApiTests { private static RestTestHelper testHelper; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTests.java similarity index 96% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTests.java index dc9c56e57..c4785547d 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTests.java @@ -20,10 +20,10 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.support.RestTestHelper; -import org.springframework.data.neo4j.template.Neo4jTemplateTest; +import org.springframework.data.neo4j.template.Neo4jTemplateTests; import org.springframework.transaction.PlatformTransactionManager; -public class RestNeo4jTemplateTest extends Neo4jTemplateTest +public class RestNeo4jTemplateTests extends Neo4jTemplateTests { private static RestTestHelper testHelper; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTests.java similarity index 93% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTests.java index 36550d17b..6b905a757 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTests.java @@ -21,11 +21,11 @@ import org.junit.BeforeClass; import org.springframework.data.neo4j.config.NullTransactionManager; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.support.RestTestHelper; -import org.springframework.data.neo4j.template.NeoTraversalTest; +import org.springframework.data.neo4j.template.NeoTraversalTests; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; -public class RestNeoTraversalTest extends NeoTraversalTest +public class RestNeoTraversalTests extends NeoTraversalTests { private static RestTestHelper testHelper; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java similarity index 90% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java index 5e15d25ec..57d0d55b5 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.NodeEntityRelationshipTest; +import org.springframework.data.neo4j.aspects.support.NodeEntityRelationshipTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestNodeEntityRelationshipTest extends NodeEntityRelationshipTest { +public class RestNodeEntityRelationshipTests extends NodeEntityRelationshipTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java index 29339bdfa..5fa1ab354 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.NodeEntityTest; +import org.springframework.data.neo4j.aspects.support.NodeEntityTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -35,10 +35,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestNodeEntityTest extends NodeEntityTest { +public class RestNodeEntityTests extends NodeEntityTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java similarity index 91% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java index 02ef40896..eaf7f57fc 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.ProjectionTest; +import org.springframework.data.neo4j.aspects.support.ProjectionTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", -"classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", +"classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestProjectionTest extends ProjectionTest { +public class RestProjectionTests extends ProjectionTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java index fa3e7323f..1611ba4bb 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.PropertyTest; +import org.springframework.data.neo4j.aspects.support.PropertyTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", -"classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", +"classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestPropertyTest extends PropertyTest { +public class RestPropertyTests extends PropertyTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java similarity index 90% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java index 2ebb74aca..2584aa258 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.RelationshipEntityTest; +import org.springframework.data.neo4j.aspects.support.RelationshipEntityTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", -"classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", +"classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestRelationshipEntityTest extends RelationshipEntityTest { +public class RestRelationshipEntityTests extends RelationshipEntityTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java similarity index 91% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java index 4225b0985..5fa79876d 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.neo4j.aspects.support.TraversalTest; +import org.springframework.data.neo4j.aspects.support.TraversalTests; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; @@ -34,10 +34,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"} ) +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"} ) @TestExecutionListeners( {CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class} ) -public class RestTraversalTest extends TraversalTest +public class RestTraversalTests extends TraversalTests { @BeforeClass diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java similarity index 91% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java index 1bafe6c5b..c13d66d17 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java @@ -21,7 +21,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.data.neo4j.unique.UniqueEntityTest; +import org.springframework.data.neo4j.unique.UniqueEntityTests; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,9 +36,9 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:unique-test-context.xml", - "classpath:RestTest-context.xml"}) + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestUniqueEntityTest extends UniqueEntityTest { +public class RestUniqueEntityTests extends UniqueEntityTests { @BeforeClass public static void startDb() throws Exception { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTests.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTests.java index fbc2ce078..c7b07754c 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTests.java @@ -28,7 +28,7 @@ import java.util.Arrays; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.MapUtil.map; -public class RestEntityTest extends RestTestBase { +public class RestEntityTests extends RestTestBase { @Test public void testSetProperty() { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTests.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTests.java index 444442e34..5c33604ac 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTests.java @@ -22,7 +22,7 @@ import org.neo4j.graphdb.*; import java.util.Date; -public class RestGraphDbTest extends RestTestBase { +public class RestGraphDbTests extends RestTestBase { @Test public void testGetRefNode() { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTests.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTests.java index f749c577b..7d5b6add1 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGremlinQueryEngineTests.java @@ -20,7 +20,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.aspects.support.query.GremlinQueryEngineTest; +import org.springframework.data.neo4j.aspects.support.query.GremlinQueryEngineTests; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.SpringRestGraphDatabase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; @@ -36,10 +36,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 23.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestGremlinQueryEngineTest extends GremlinQueryEngineTest { +public class RestGremlinQueryEngineTests extends GremlinQueryEngineTests { @Autowired SpringRestGraphDatabase restGraphDatabase; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTests.java similarity index 99% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTests.java index 7d75c0dc5..05b62bce8 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTests.java @@ -26,7 +26,7 @@ import org.neo4j.graphdb.index.RelationshipIndex; import java.util.Arrays; -public class RestIndexTest extends RestTestBase { +public class RestIndexTests extends RestTestBase { private static final String NODE_INDEX_NAME = "NODE_INDEX"; private static final String REL_INDEX_NAME = "REL_INDEX"; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java similarity index 93% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java index 69815f93f..751006162 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.neo4j.aspects.support.query.QueryEngineTest; +import org.springframework.data.neo4j.aspects.support.query.QueryEngineTests; import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.SpringRestGraphDatabase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; @@ -38,10 +38,10 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 23.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:RestTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", + "classpath:RestTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class RestQueryEngineTest extends QueryEngineTest { +public class RestQueryEngineTests extends QueryEngineTests { @Autowired SpringRestGraphDatabase restGraphDatabase; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTests.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTests.java index b304b3e43..62e77ff36 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTests.java @@ -30,7 +30,7 @@ import java.util.Map; * @author Michael Hunger * @since 03.02.11 */ -public class RestTraversalDescriptionTest +public class RestTraversalDescriptionTests { private RestTraversal traversalDescription; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTests.java similarity index 95% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTests.java index dd3d49a1c..2c2ea3f67 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTests.java @@ -24,7 +24,7 @@ import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; import org.neo4j.rest.graphdb.traversal.RestTraversal; -public class RestTraversalExecutionTest extends RestTestBase { +public class RestTraversalExecutionTests extends RestTestBase { @Test public void testTraverseToNeighbour() { final Relationship rel = relationship(); diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTests.java similarity index 97% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTests.java index 7e29241dc..51bbd2fb0 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTests.java @@ -37,7 +37,7 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson; * @author mh * @since 14.04.11 */ -public class ServerPluginTest extends RestTestBase { +public class ServerPluginTests extends RestTestBase { @BeforeClass public static void init() { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTests.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTests.java index f427bcf85..11a52b11f 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTests.java @@ -33,11 +33,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; @Path( "/" ) -public class SpringPluginInitializerTest extends SpringPluginInitializer implements TestInterface { +public class SpringPluginInitializerTests extends SpringPluginInitializer implements TestInterface { private LocalTestServer neoServer; - public SpringPluginInitializerTest() { - super( new String[]{"ServerTest-context.xml"}, expose("testObject", TestInterface.class) ); + public SpringPluginInitializerTests() { + super( new String[]{"ServerTests-context.xml"}, expose("testObject", TestInterface.class) ); } private static int touched = 0; diff --git a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle index 69d72b68d..ba08cbf82 100644 --- a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle +++ b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle @@ -1 +1 @@ -org.springframework.data.neo4j.rest.support.SpringPluginInitializerTest +org.springframework.data.neo4j.rest.support.SpringPluginInitializerTests diff --git a/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml b/spring-data-neo4j-rest/src/test/resources/RestTests-context.xml similarity index 100% rename from spring-data-neo4j-rest/src/test/resources/RestTest-context.xml rename to spring-data-neo4j-rest/src/test/resources/RestTests-context.xml diff --git a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml b/spring-data-neo4j-rest/src/test/resources/ServerTests-context.xml similarity index 85% rename from spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml rename to spring-data-neo4j-rest/src/test/resources/ServerTests-context.xml index ca009e85b..fb465c467 100644 --- a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml +++ b/spring-data-neo4j-rest/src/test/resources/ServerTests-context.xml @@ -3,6 +3,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - + diff --git a/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java b/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTests.java similarity index 96% rename from spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java rename to spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTests.java index cdf047d4b..ef1b9b0a3 100644 --- a/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java +++ b/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTests.java @@ -25,17 +25,17 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import static junit.framework.Assert.*; import static org.junit.Assert.assertThat; -import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createFailingTransactionManager; -import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createNonFailingTransactionManager; -import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.isCommitted; -import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.wasRolledback; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTests.TestPlatformTransactionManager.createFailingTransactionManager; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTests.TestPlatformTransactionManager.createNonFailingTransactionManager; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTests.TransactionManagerMatcher.isCommitted; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTests.TransactionManagerMatcher.wasRolledback; import static org.springframework.transaction.HeuristicCompletionException.getStateString; /** * @author mh * @since 15.02.11 */ -public class ChainedTransactionManagerTest { +public class ChainedTransactionManagerTests { private ChainedTransactionManager tm; diff --git a/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java b/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTests.java similarity index 99% rename from spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java rename to spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTests.java index b2f5e778e..5e6463695 100644 --- a/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java +++ b/spring-data-neo4j-tx/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotNull; * @since 21.02.11 */ -public class JOTMIntegrationTest { +public class JOTMIntegrationTests { private ClassPathXmlApplicationContext ctx; private GraphDatabaseService gds; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTests.java index 4d5772f1a..4d20ed780 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalMappingTests.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertSame; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:related-to-test-context.xml"}) @Transactional -public class BiDirectionalMappingTest { +public class BiDirectionalMappingTests { @NodeEntity static class TestEntityOne { @GraphId Long id; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTests.java index 14b0a2c29..a19a91dbc 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaMappingTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertSame; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:related-to-test-context.xml"}) @Transactional -public class BiDirectionalRelatedToViaMappingTest { +public class BiDirectionalRelatedToViaMappingTests { @NodeEntity static class TestEntity { @GraphId Long id; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTests.java index 26458d1d4..e76093aef 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithCollectionFetchMappingTests.java @@ -37,7 +37,7 @@ import static org.junit.internal.matchers.IsCollectionContaining.hasItems; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:related-to-test-context.xml"}) @Transactional -public class BiDirectionalRelatedToViaWithCollectionFetchMappingTest { +public class BiDirectionalRelatedToViaWithCollectionFetchMappingTests { @NodeEntity static class TestEntity { @GraphId Long id; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTests.java index 09dfca9fb..9406623a7 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/annotation/relatedto/BiDirectionalRelatedToViaWithSingleFetchMappingTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertSame; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:related-to-test-context.xml"}) @Transactional -public class BiDirectionalRelatedToViaWithSingleFetchMappingTest { +public class BiDirectionalRelatedToViaWithSingleFetchMappingTests { @NodeEntity static class TestEntity { @GraphId Long id; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java index a5cbacc0d..c574467d6 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java @@ -24,12 +24,12 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * @author mh * @since 23.03.11 */ -public class ConfigurationConfirmationTest { +public class ConfigurationConfirmationTests { @Test(expected = BeanCreationException.class) public void testInvalidTransactionManagerFails() { ClassPathXmlApplicationContext ctx = null; try { - ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/ConfigurationConfirmationTest-context.xml"); + ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml"); ctx.start(); } finally { if (ctx != null) { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java index 38fd895a7..d7541af2c 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; * @since 31.01.11 */ -public class DataGraphNamespaceHandlerTest { +public class DataGraphNamespaceHandlerTests { static class Config { @Autowired @@ -116,7 +116,7 @@ public class DataGraphNamespaceHandlerTest { } private Config assertInjected(String testCase) { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest" + testCase + "-context.xml"); + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests" + testCase + "-context.xml"); try { Config config = ctx.getBean("config", Config.class); Neo4jTemplate template = config.neo4jTemplate; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTests.java index b5f49e19f..2680ba1df 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryMapResultConverterTests.java @@ -34,7 +34,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; import static org.neo4j.helpers.collection.MapUtil.map; -public class QueryMapResultConverterTest extends Neo4jPersistentTestBase { +public class QueryMapResultConverterTests extends Neo4jPersistentTestBase { private Map simpleMap; private List friends; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTests.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTests.java index 70d690672..131b3fa0c 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/conversion/QueryResultBuilderTests.java @@ -27,7 +27,7 @@ import static org.springframework.data.neo4j.conversion.QueryResultBuilder.from; * @author mh * @since 11.11.11 */ -public class QueryResultBuilderTest { +public class QueryResultBuilderTests { private final DefaultConverter defaultConverter = new DefaultConverter(); private QueryResultBuilder result = new QueryResultBuilder(asList(1, 2, 3)); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTests.java index a2a54d6b0..31823beaf 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/fieldaccess/PrefixedDynamicPropertyTests.java @@ -29,7 +29,7 @@ import java.util.Map; import org.junit.Test; import org.neo4j.helpers.collection.IteratorUtil; -public class PrefixedDynamicPropertyTest { +public class PrefixedDynamicPropertyTests { private static final String VALUE = "value"; private static final String VALUE2 = "value2"; private static final String DEFAULT_VALUE = "default_value"; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTests.java index 97bd30857..b06d37f36 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/inheritance/InheritanceTests.java @@ -37,7 +37,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.count; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration -public class InheritanceTest { +public class InheritanceTests { private String validName="projectDetail"; @Autowired ProjectRepository projectRepository; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTests.java index cbf2915d3..7dbcc8b9f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityConverterTests.java @@ -40,7 +40,7 @@ import static org.neo4j.helpers.collection.IteratorUtil.first; * @author mh * @since 19.09.11 */ -public class Neo4jEntityConverterTest extends Neo4jPersistentTestBase { +public class Neo4jEntityConverterTests extends Neo4jPersistentTestBase { /* OUCH diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTests.java index 0d1d541dd..84797fa0d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jEntityPersisterTests.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertNotSame; * @author mh * @since 12.10.11 */ -public class Neo4jEntityPersisterTest extends Neo4jPersistentTestBase { +public class Neo4jEntityPersisterTests extends Neo4jPersistentTestBase { @Test public void testCreateEntityFromStoredType() throws Exception { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTests.java index 9753097ce..8ac31abf5 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jMappingContextTests.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; * @author mh * @since 19.09.11 */ -public class Neo4jMappingContextTest { +public class Neo4jMappingContextTests { private Neo4jMappingContext mappingContext; private Neo4jPersistentEntityImpl personType; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTests.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTests.java index 5bbbd95bb..62b7b225e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/Neo4jPersistentEntityTests.java @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; * @author mh * @since 20.02.12 */ -public class Neo4jPersistentEntityTest { +public class Neo4jPersistentEntityTests { private Neo4jMappingContext mappingContext; private Neo4jPersistentEntityImpl personType; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTests.java index 62d96d762..34ba4fbf3 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/mapping/invalid/InvalidMappingTests.java @@ -21,7 +21,7 @@ import org.springframework.data.mapping.model.MappingException; import org.springframework.data.neo4j.annotation.*; import org.springframework.data.neo4j.support.mapping.Neo4jMappingContext; -public class InvalidMappingTest { +public class InvalidMappingTests { @NodeEntity static class TestEntityRelatedTo { @GraphId Long id; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTests.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTests.java index 6b3e7395e..88ac21209 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/CypherDslRepositoryTests.java @@ -51,10 +51,10 @@ import static org.neo4j.helpers.collection.MapUtil.map; * @since 11.11.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/repository/GraphRepositoryTests-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) @Transactional -public class CypherDslRepositoryTest { +public class CypherDslRepositoryTests { @Autowired PersonRepository personRepository; @Autowired Neo4jOperations template; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java index ea3e3bd1d..1b2ecfbd5 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/GraphRepositoryTests.java @@ -69,7 +69,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class GraphRepositoryTest { +public class GraphRepositoryTests { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTests.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTests.java index 0c1a5659f..1f687ee63 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/NoIndexDerivedFinderTests.java @@ -42,9 +42,9 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml") +@ContextConfiguration("classpath:org/springframework/data/neo4j/repository/GraphRepositoryTests-context.xml") @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class NoIndexDerivedFinderTest { +public class NoIndexDerivedFinderTests { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTests.java similarity index 96% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTests.java index 35ec3f1bc..120c739f1 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/ReadWriteTests.java @@ -30,9 +30,9 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; @Ignore -public class ReadWriteTest { +public class ReadWriteTests { public static void main(String[] args) throws IOException { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:ReadWriteTest-context.xml"); + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:ReadWriteTests-context.xml"); boolean delete = false; try { Neo4jTemplate template = ctx.getBean(Neo4jTemplate.class); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTests.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTests.java index ddba5668a..cf575f29d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/SpatialGraphRepositoryTests.java @@ -44,9 +44,9 @@ import static org.neo4j.helpers.collection.IteratorUtil.asCollection; @RunWith(SpringJUnit4ClassRunner.class) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/repository/GraphRepositoryTests-context.xml"}) @Transactional -public class SpatialGraphRepositoryTest { +public class SpatialGraphRepositoryTests { protected final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTests.java index 4b47347db..b71299879 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTests.java @@ -51,7 +51,7 @@ import org.neo4j.index.lucene.ValueContext; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) -public class DerivedFinderMethodTest { +public class DerivedFinderMethodTests { @NodeEntity public static class Thing { @@ -111,7 +111,7 @@ public class DerivedFinderMethodTest { @Test public void testQueryWithEntityGraphId() throws Exception { assertRepositoryQueryMethod(ThingRepository.class, "findByOwnerId",new Object[]{123}, - "START `thing_owner`=node({0}) MATCH `thing`-[:`owner`]->`thing_owner` WHERE (has(`thing`.__type__) AND `thing`.__type__ IN ['org.springframework.data.neo4j.repository.query.DerivedFinderMethodTest$Thing']) ", + "START `thing_owner`=node({0}) MATCH `thing`-[:`owner`]->`thing_owner` WHERE (has(`thing`.__type__) AND `thing`.__type__ IN ['org.springframework.data.neo4j.repository.query.DerivedFinderMethodTests$Thing']) ", 123); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTests.java index 39d029cbb..744d1e5e4 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTests.java @@ -33,7 +33,7 @@ import org.springframework.data.neo4j.support.mapping.Neo4jMappingContext; * @author Oliver Gierke */ @Ignore("until merged with DATAGRAPH-113") -public class MatchClauseUnitTest { +public class MatchClauseUnitTests { Neo4jMappingContext context; private VariableContext variableContext; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/ThingRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/ThingRepository.java index 775c55db1..cbcb85aa4 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/ThingRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/ThingRepository.java @@ -20,37 +20,39 @@ import org.springframework.data.neo4j.repository.GraphRepository; import java.util.Collection; import java.util.Date; -public interface ThingRepository extends GraphRepository { - DerivedFinderMethodTest.Thing findByFirstNameAndLastName(String firstName, String lastName); - DerivedFinderMethodTest.Thing findByFirstName(String firstName); - DerivedFinderMethodTest.Thing findByDescription(String firstName); - DerivedFinderMethodTest.Thing findByDescriptionAndFirstName(String description,String firstName); - DerivedFinderMethodTest.Thing findByFirstNameAndDescription(String firstName,String description); - DerivedFinderMethodTest.Thing findByAge(int age); - DerivedFinderMethodTest.Thing findByAgeAndFirstName(int age,String firstName); - DerivedFinderMethodTest.Thing findByFirstNameLike(String firstName); - DerivedFinderMethodTest.Thing findByFirstNameContains(String firstName); - DerivedFinderMethodTest.Thing findByFirstNameEndsWith(String firstName); - DerivedFinderMethodTest.Thing findByFirstNameStartsWith(String firstName); - DerivedFinderMethodTest.Thing findByNumber(int number); +import static org.springframework.data.neo4j.repository.query.DerivedFinderMethodTests.Thing; + +public interface ThingRepository extends GraphRepository { + Thing findByFirstNameAndLastName(String firstName, String lastName); + Thing findByFirstName(String firstName); + Thing findByDescription(String firstName); + Thing findByDescriptionAndFirstName(String description,String firstName); + Thing findByFirstNameAndDescription(String firstName,String description); + Thing findByAge(int age); + Thing findByAgeAndFirstName(int age,String firstName); + Thing findByFirstNameLike(String firstName); + Thing findByFirstNameContains(String firstName); + Thing findByFirstNameEndsWith(String firstName); + Thing findByFirstNameStartsWith(String firstName); + Thing findByNumber(int number); - DerivedFinderMethodTest.Thing findByName(String name); - DerivedFinderMethodTest.Thing findByNameStartsWith(String name); - DerivedFinderMethodTest.Thing findByNameEndsWith(String name); - DerivedFinderMethodTest.Thing findByNameContains(String name); + Thing findByName(String name); + Thing findByNameStartsWith(String name); + Thing findByNameEndsWith(String name); + Thing findByNameContains(String name); - DerivedFinderMethodTest.Thing findByNameLike(String name); - DerivedFinderMethodTest.Thing findByNameNotLike(String name); - DerivedFinderMethodTest.Thing findByNameMatches(String name); - DerivedFinderMethodTest.Thing findByTaggedIsTrue(); - DerivedFinderMethodTest.Thing findByTaggedIsFalse(); + Thing findByNameLike(String name); + Thing findByNameNotLike(String name); + Thing findByNameMatches(String name); + Thing findByTaggedIsTrue(); + Thing findByTaggedIsFalse(); - DerivedFinderMethodTest.Thing findByNameExists(); - DerivedFinderMethodTest.Thing findByNameIn(Collection values); - DerivedFinderMethodTest.Thing findByNameNotIn(Collection values); + Thing findByNameExists(); + Thing findByNameIn(Collection values); + Thing findByNameNotIn(Collection values); - DerivedFinderMethodTest.Thing findByBornBefore(Date date); - DerivedFinderMethodTest.Thing findByBornAfter(Date date); - DerivedFinderMethodTest.Thing findById(long id); - DerivedFinderMethodTest.Thing findByOwnerId(long id); + Thing findByBornBefore(Date date); + Thing findByBornAfter(Date date); + Thing findById(long id); + Thing findByOwnerId(long id); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTests.java index b32fb360a..23f1991c1 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/DelegatingGraphDatabaseTests.java @@ -31,7 +31,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; * @author mh * @since 11.04.12 */ -public class DelegatingGraphDatabaseTest { +public class DelegatingGraphDatabaseTests { private DelegatingGraphDatabase graphDatabase; private ImpermanentGraphDatabase gdb; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTests.java index 515e60378..c4b2c385d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityNeo4jTemplateTests.java @@ -63,7 +63,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:template-config-context.xml"}) -public class EntityNeo4jTemplateTest extends EntityTestBase { +public class EntityNeo4jTemplateTests extends EntityTestBase { public static final DynamicRelationshipType KNOWS = DynamicRelationshipType.withName("knows"); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTests.java index 0895c23c3..faa4d5b65 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTests.java @@ -29,7 +29,7 @@ import org.springframework.data.neo4j.core.GraphDatabase; * @author mh * @since 29.03.11 */ -public class GraphDatabaseFactoryTest { +public class GraphDatabaseFactoryTests { @Test public void shouldCreateLocalDatabaseFromContext() throws Exception { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTests.java index f3d5cf19e..9d9ba43d3 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/FullNeo4jTemplateTests.java @@ -54,7 +54,7 @@ import static org.neo4j.helpers.collection.MapUtil.map; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:template-config-context.xml"}) -public class FullNeo4jTemplateTest { +public class FullNeo4jTemplateTests { private static final DynamicRelationshipType KNOWS = DynamicRelationshipType.withName("knows"); private static final DynamicRelationshipType HAS = DynamicRelationshipType.withName("has"); @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTests.java index d99e332da..dad365391 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTests.java @@ -49,7 +49,7 @@ import static org.junit.Assert.*; import static org.neo4j.helpers.collection.MapUtil.map; -public class Neo4jTemplateApiTest { +public class Neo4jTemplateApiTests { private static final DynamicRelationshipType KNOWS = DynamicRelationshipType.withName("knows"); private static final DynamicRelationshipType HAS = DynamicRelationshipType.withName("has"); protected Neo4jTemplate template; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTests.java index b4adc9cd0..29e4df9c8 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTests.java @@ -27,9 +27,9 @@ import org.springframework.data.neo4j.support.Neo4jTemplate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.neo4j.helpers.collection.MapUtil.map; -import static org.springframework.data.neo4j.template.Neo4jTemplateTest.Type.HAS; +import static org.springframework.data.neo4j.template.Neo4jTemplateTests.Type.HAS; -public class Neo4jTemplateTest extends NeoApiTest { +public class Neo4jTemplateTests extends NeoApiTests { enum Type implements RelationshipType { HAS diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTests.java index 6368e2616..47e3c5939 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTests.java @@ -30,7 +30,7 @@ import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; -public abstract class NeoApiTest { +public abstract class NeoApiTests { protected GraphDatabase graph; protected Neo4jTemplate template; protected PlatformTransactionManager transactionManager; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTests.java index 78dddafc6..bc383fdf1 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTests.java @@ -34,9 +34,9 @@ import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.MapUtil.map; // TODO import static org.neo4j.kernel.Traversal.returnAllButStartNode; -import static org.springframework.data.neo4j.template.NeoTraversalTest.Type.HAS; +import static org.springframework.data.neo4j.template.NeoTraversalTests.Type.HAS; -public class NeoTraversalTest extends NeoApiTest { +public class NeoTraversalTests extends NeoApiTests { enum Type implements RelationshipType { MARRIED, CHILD, GRANDSON, GRANDDAUGHTER, WIFE, HUSBAND, HAS diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTests.java index 17302d6ee..00e039dcc 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/typerepresentation/TypeRepresentationTests.java @@ -25,7 +25,7 @@ import org.springframework.data.neo4j.support.Neo4jTemplate; import org.springframework.data.neo4j.support.typerepresentation.SubReferenceNodeTypeRepresentationStrategy; import org.springframework.data.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory; -public class TypeRepresentationTest { +public class TypeRepresentationTests { @Test public void testSavingTwiceResultsOnlyInOneTRSCall() throws Exception { ImpermanentGraphDatabase db = new ImpermanentGraphDatabase(); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTests.java similarity index 99% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTests.java index 8c81e9531..27d975164 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueEntityTests.java @@ -39,7 +39,7 @@ import static junit.framework.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:unique-test-context.xml"}) @Transactional -public class UniqueEntityTest { +public class UniqueEntityTests { @Autowired private ClubRepository clubRepository; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTests.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTests.java index f03c19c19..b91fb86d9 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/unique/UniqueRelationshipTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotSame; * @author mh * @since 18.04.12 */ -public class UniqueRelationshipTest extends Neo4jPersistentTestBase { +public class UniqueRelationshipTests extends Neo4jPersistentTestBase { @Test public void testCreateUniqueRelationship() { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTests.java similarity index 96% rename from spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTests.java index 89bfe4278..9e7eea792 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBaseTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals; * @author mh * @since 06.10.11 */ -public class DocumentingTestBaseTest extends DocumentingTestBase { +public class DocumentingTestBaseTests extends DocumentingTestBase { // SNIPPET x { title="Documents DocumentingTestBase"; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/GroupRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/GroupRepository.java index 5ab1d5b48..7cd1b636d 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/GroupRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/GroupRepository.java @@ -17,8 +17,10 @@ package org.springframework.data.test.snippets; import org.springframework.data.neo4j.repository.GraphRepository; +import static org.springframework.data.test.snippets.SnippetRepositoryDerivedFinderTests.Group; + /** * @author mh * @since 14.10.11 */ -public interface GroupRepository extends GraphRepository { } +public interface GroupRepository extends GraphRepository { } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/PersonRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/PersonRepository.java index 1e2dcd4fe..5b2b80a7a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/PersonRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/PersonRepository.java @@ -17,10 +17,12 @@ package org.springframework.data.test.snippets; import org.springframework.data.neo4j.repository.GraphRepository; +import static org.springframework.data.test.snippets.SnippetRepositoryDerivedFinderTests.Person; + /** * @author mh * @since 14.10.11 */ -public interface PersonRepository extends GraphRepository { - Iterable findByGroupTitle(String name); +public interface PersonRepository extends GraphRepository { + Iterable findByGroupTitle(String name); } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTests.java similarity index 96% rename from spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTests.java index 3a089e055..52689bb1c 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetNeo4jTemplateMethodsTests.java @@ -35,8 +35,8 @@ import static org.junit.Assert.assertEquals; import static org.neo4j.helpers.collection.MapUtil.map; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath*:DocumentingTest-context.xml"}) -public class SnippetNeo4jTemplateMethodsTest extends DocumentingTestBase { +@ContextConfiguration(locations = {"classpath*:DocumentingTests-context.xml"}) +public class SnippetNeo4jTemplateMethodsTests extends DocumentingTestBase { @Autowired private GraphDatabase graphDatabase; private static final RelationshipType WORKS_WITH = DynamicRelationshipType.withName("WORKS_WITH"); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTests.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTests.java index 952cd6126..440745b82 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/snippets/SnippetRepositoryDerivedFinderTests.java @@ -36,8 +36,8 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath*:DocumentingTest-context.xml"}) -public class SnippetRepositoryDerivedFinderTest extends DocumentingTestBase { +@ContextConfiguration(locations = {"classpath*:DocumentingTests-context.xml"}) +public class SnippetRepositoryDerivedFinderTests extends DocumentingTestBase { @Autowired Neo4jTemplate template; // SNIPPET derived diff --git a/spring-data-neo4j/src/test/resources/DocumentingTest-context.xml b/spring-data-neo4j/src/test/resources/DocumentingTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/DocumentingTest-context.xml rename to spring-data-neo4j/src/test/resources/DocumentingTests-context.xml diff --git a/spring-data-neo4j/src/test/resources/ReadWriteTest-context.xml b/spring-data-neo4j/src/test/resources/ReadWriteTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/ReadWriteTest-context.xml rename to spring-data-neo4j/src/test/resources/ReadWriteTests-context.xml diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-code-context.xml similarity index 95% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-code-context.xml index 963c4fc70..576562968 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-code-context.xml @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml similarity index 96% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml index 4954ea34d..eeb2c92ac 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-conversion-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml similarity index 93% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-conversion-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml index 2624d84fb..7eeebda37 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-conversion-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml @@ -13,13 +13,13 @@ - + - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-entities-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-entities-context.xml similarity index 95% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-entities-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-entities-context.xml index 638e0feb4..1b099b427 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-entities-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-entities-context.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml similarity index 96% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml index 217d70aed..c631a1c55 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml @@ -21,5 +21,5 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-ha-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml similarity index 97% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-ha-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml index c60bc6c0a..d1afa601d 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-ha-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml @@ -23,5 +23,5 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/inheritance/InheritanceTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/inheritance/InheritanceTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/inheritance/InheritanceTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/inheritance/InheritanceTests-context.xml diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/GraphRepositoryTests-context.xml diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTests-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/repository/query/DerivedFinderMethodTests-context.xml