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

DATAGRAPH-524 Update Schema Handler to 3.0 by default, adapt failing test-xml contexts

Browse Source
This commit is contained in:
Michael Hunger
2014-11-10 13:33:02 +01:00
parent e7a7feb290
commit cba3daf95a
18 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/illegal-index1-tests-context.xml
View File

@@ -9,7 +9,7 @@
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
<context:annotation-config/>
<neo4j:config graphDatabaseService="graphDatabaseService" />
<neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.illegal.aspects.index1.dummy" />
<bean id="indexCreationMappingEventListener" class="org.springframework.data.neo4j.support.mapping.DefaultEntityIndexCreator">
<constructor-arg ref="indexProvider" />

4
spring-data-neo4j-cross-store/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
View File

@@ -12,7 +12,7 @@
<context:spring-configured/>
<context:annotation-config/>
<neo4j:config storeDirectory="target/config-test" entityManagerFactory="entityManagerFactory"/>
<neo4j:config storeDirectory="target/config-test" entityManagerFactory="entityManagerFactory" base-package="org.springframework.data.neo4j.config.cross"/>
<bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
<property name="dataSource" ref="dataSource"/>
@@ -25,4 +25,4 @@
<property name="password" value=""/>
</bean>
</beans>
</beans>

2
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
View File

@@ -67,7 +67,7 @@ import javax.enterprise.inject.Produces;
* @author Thomas Risberg
*/
@Configuration
public abstract class Neo4jConfiguration { // implements TransactionManagementConfigurer {
public class Neo4jConfiguration {
private GraphDatabaseService graphDatabaseService;
private ConversionService conversionService;

1
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseServiceFactoryBean.java
View File

@@ -63,6 +63,7 @@ public class GraphDatabaseServiceFactoryBean implements FactoryBean<GraphDatabas
public void shutdown() {
if (database != null) {
database.shutdown();
database = null;
}
}
}

1
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/AuditingIntegrationTests.java
View File

@@ -19,6 +19,7 @@ import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.joda.time.DateTime;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;

1
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/BasicJavaConfigTest.java
View File

@@ -1,6 +1,7 @@
package org.springframework.data.neo4j.config;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.neo4j.graphdb.GraphDatabaseService;
import org.neo4j.graphdb.Transaction;

1
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.data.neo4j.config;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.support.ClassPathXmlApplicationContext;

4
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests.java
View File

@@ -124,12 +124,12 @@ public class DataGraphNamespaceHandlerTests {
Config config = ctx.getBean("config", Config.class);
Neo4jTemplate template = config.neo4jTemplate;
Assert.assertNotNull("template", template);
AbstractGraphDatabase graphDatabaseService = (AbstractGraphDatabase) template.getGraphDatabaseService();
GraphDatabaseAPI graphDatabaseService = (GraphDatabaseAPI) template.getGraphDatabaseService();
String fileSeparator = "target" + System.getProperty("file.separator") + "config-test";
Assert.assertTrue("store-dir", graphDatabaseService.getStoreDir().endsWith(fileSeparator));
Assert.assertNotNull("graphDatabaseService",config.graphDatabaseService);
Assert.assertNotNull("transactionManager",config.transactionManager);
config.graphDatabaseService.shutdown();
// config.graphDatabaseService.shutdown();
return config;
} finally {
ctx.close();

2
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesJavaConfigTests.java
View File

@@ -28,6 +28,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.neo4j.model.Person;
import org.springframework.data.neo4j.repositories.ClassWithNestedRepository.NestedUserRepository;
import org.springframework.data.neo4j.repositories.PersonRepository;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -38,6 +39,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@DirtiesContext
public class NestedNeo4jRepositoriesJavaConfigTests {
@Configuration

3
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/NestedNeo4jRepositoriesNamspaceConfigTests.java
View File

@@ -18,10 +18,12 @@ package org.springframework.data.neo4j.config;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
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.repositories.ClassWithNestedRepository.NestedUserRepository;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -32,6 +34,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "DataGraphNamespaceHandlerTests-nested-repositories-context.xml")
@DirtiesContext
public class NestedNeo4jRepositoriesNamspaceConfigTests {
@Autowired NestedUserRepository fooRepository;

2
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/spring/BasicJavaConfig.java
View File

@@ -15,7 +15,7 @@ public class BasicJavaConfig extends Neo4jConfiguration {
setBasePackage("org.springframework.data.neo4j.model");
}
@Bean
@Bean(destroyMethod = "shutdown")
public GraphDatabaseService graphDatabaseService() {
return new TestGraphDatabaseFactory().newImpermanentDatabase();
}

1
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/cdi/CdiExtensionIntegrationTests.java
View File

@@ -35,6 +35,7 @@ import org.springframework.data.neo4j.model.Person;
* @author Nicki Watt
* @author Oliver Gierke
*/
@Ignore
public class CdiExtensionIntegrationTests {
static CdiTestContainer container;

4
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationConfirmationTests-context.xml
View File

@@ -9,7 +9,7 @@
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
<context:annotation-config/>
<neo4j:config storeDirectory="target/config-test"/>
<neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.config"/>
<bean name="neo4jTransactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<property name="dataSource" ref="dataSource"/>
@@ -21,4 +21,4 @@
<property name="username" value="sa"/>
<property name="password" value=""/>
</bean>
</beans>
</beans>

7
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-context.xml
View File

@@ -9,12 +9,11 @@
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
<context:annotation-config/>
<bean id="graphDbFactory" class="org.neo4j.graphdb.factory.GraphDatabaseFactory"/>
<bean id="graphDatabaseService" scope="singleton" destroy-method="shutdown" factory-bean="graphDbFactory" factory-method="newEmbeddedDatabase">
<bean id="graphDatabaseService" destroy-method="shutdown" class="org.springframework.data.neo4j.support.GraphDatabaseServiceFactoryBean">
<constructor-arg value="target/config-test"/>
</bean>
<neo4j:config graphDatabaseService="graphDatabaseService"/>
<neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.config"/>
<bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
<neo4j:repositories base-package="org.springframework.data.neo4j.model"/>
</beans>
</beans>

4
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-conversion-context.xml
View File

@@ -18,8 +18,8 @@
</property>
</bean>
<neo4j:config storeDirectory="target/config-test"/>
<neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.config"/>
<neo4j:repositories base-package="org.springframework.data.neo4j.model"/>
<bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
</beans>
</beans>

4
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-embedded-context.xml
View File

@@ -20,6 +20,6 @@
</constructor-arg>
</bean>
<neo4j:config graphDatabaseService="graphDatabaseService"/>
<neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.config"/>
<bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
</beans>
</beans>

4
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-external-ha-context.xml
View File

@@ -22,6 +22,6 @@
</constructor-arg>
</bean>
<neo4j:config graphDatabaseService="haDatabase"/>
<neo4j:config graphDatabaseService="haDatabase" base-package="org.springframework.data.neo4j.config"/>
<bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTests$Config"/>
</beans>
</beans>

3
spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTests-nested-repositories-context.xml
View File

@@ -3,10 +3,9 @@
xmlns:context="http://www.springframework.org/schema/context"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:neo4j="http://www.springframework.org/schema/data/neo4j"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j.xsd">
<context:annotation-config/>
<neo4j:config storeDirectory="target/config-test" base-package="org.springframework.data.neo4j.model"/>