From f3b5545b89feb7e49899071fbff1b6b2f976dc92 Mon Sep 17 00:00:00 2001 From: Michael Hunger Date: Tue, 9 Jun 2015 03:03:20 +0200 Subject: [PATCH] DATAGRAPH-580 - Tests fail against Spring Framework 4.1.6. Removed obsolete TestListeners. --- .../rest/integration/RestEntityPropertyValidationTests.java | 4 ---- .../data/neo4j/rest/integration/RestFinderTests.java | 4 ---- .../neo4j/rest/integration/RestGraphRepositoryTests.java | 4 ---- .../data/neo4j/rest/integration/RestIndexTests.java | 4 ---- .../rest/integration/RestNodeEntityRelationshipTests.java | 4 ---- .../data/neo4j/rest/integration/RestNodeEntityTests.java | 4 ---- .../data/neo4j/rest/integration/RestProjectionTests.java | 5 ----- .../data/neo4j/rest/integration/RestPropertyTests.java | 5 ----- .../neo4j/rest/integration/RestRelationshipEntityTests.java | 4 ---- .../data/neo4j/rest/integration/RestRelationshipTests.java | 5 ----- .../data/neo4j/rest/integration/RestTraversalTests.java | 4 ---- .../data/neo4j/rest/integration/RestUniqueEntityTests.java | 5 ----- .../data/neo4j/rest/support/RestQueryEngineTests.java | 4 ---- 13 files changed, 56 deletions(-) diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java index 323cbc9dd..3d3a2e17b 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTests.java @@ -22,10 +22,7 @@ import org.springframework.data.neo4j.aspects.support.EntityPropertyValidationTe import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh @@ -34,7 +31,6 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:RestTests-context.xml"}) - public class RestEntityPropertyValidationTests extends EntityPropertyValidationTests { @BeforeClass diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java index 8af9b3e87..eb95c3cf4 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTests.java @@ -23,12 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestGraphRepositoryTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestGraphRepositoryTests.java index d93b6f745..2146293c2 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestGraphRepositoryTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestGraphRepositoryTests.java @@ -23,13 +23,9 @@ import org.junit.runner.RunWith; import org.neo4j.rest.graphdb.query.CypherTransactionExecutionException; import org.springframework.data.neo4j.aspects.support.GraphRepositoryTests; import org.springframework.data.neo4j.rest.support.RestTestBase; -import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import org.springframework.test.context.transaction.BeforeTransaction; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java index 63ff9e54c..18051b250 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTests.java @@ -25,12 +25,8 @@ import org.springframework.data.neo4j.aspects.Person; 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; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java index 19e01a3f9..29b97132d 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTests.java @@ -31,12 +31,8 @@ import org.springframework.data.neo4j.aspects.Mentorship; import org.springframework.data.neo4j.aspects.Person; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java index 987c4e3f0..97ca039b4 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTests.java @@ -22,12 +22,8 @@ import org.neo4j.graphdb.ConstraintViolationException; import org.neo4j.rest.graphdb.query.CypherTransactionExecutionException; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java index b04ea9a56..00eb67586 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTests.java @@ -22,12 +22,8 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh @@ -36,7 +32,6 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:RestTests-context.xml"}) - public class RestProjectionTests extends ProjectionTests { @BeforeClass diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java index cb7c638a9..05bcaca97 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTests.java @@ -22,12 +22,8 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh @@ -36,7 +32,6 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml", "classpath:RestTests-context.xml"}) - public class RestPropertyTests extends PropertyTests { @BeforeClass diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java index bfd7cace2..98cc230ac 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTests.java @@ -23,12 +23,8 @@ import org.junit.Ignore; import org.junit.runner.RunWith; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipTests.java index 00073f538..3af8b6d63 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipTests.java @@ -33,12 +33,8 @@ import org.springframework.data.neo4j.rest.SpringCypherRestGraphDatabase; import org.springframework.data.neo4j.rest.SpringRestGraphDatabase; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.support.Neo4jTemplate; -import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.annotation.EnableTransactionManagement; import static org.junit.Assert.assertEquals; @@ -49,7 +45,6 @@ import static org.junit.Assert.assertEquals; */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = RestRelationshipTests.MyConfig.class) - public class RestRelationshipTests { @Configuration diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java index 3b094d3eb..e5adf542f 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTests.java @@ -22,12 +22,8 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; 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; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java index 718808560..8779ec52d 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestUniqueEntityTests.java @@ -22,12 +22,8 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.neo4j.rest.support.RestTestBase; import org.springframework.data.neo4j.unique.common.CommonUniqueNumericIdClub; import org.springframework.data.neo4j.unique.legacy.UniqueLegacyIndexBasedEntityTests; -import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import static org.junit.Assert.assertEquals; @@ -39,7 +35,6 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration(locations = { "classpath:unique-legacy-test-context.xml", "classpath:RestTests-context.xml"}) - public class RestUniqueEntityTests extends UniqueLegacyIndexBasedEntityTests { @BeforeClass diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java index 070ce9f70..a4b6befca 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTests.java @@ -28,13 +28,9 @@ import org.springframework.data.neo4j.core.GraphDatabase; import org.springframework.data.neo4j.rest.SpringCypherRestGraphDatabase; import org.springframework.data.neo4j.rest.SpringCypherRestGraphDatabase; import org.springframework.data.neo4j.rest.SpringRestGraphDatabase; -import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import org.springframework.test.context.transaction.BeforeTransaction; -import org.springframework.test.context.transaction.TransactionalTestExecutionListener; /** * @author mh