DATAJPA-698 - Upgraded to EclipseLink 2.5.2.

Slightly refactored general infrastructure integration tests to make sure they're executed during the build. Added neccesary ignores to prevent the test cases from running into spec violations.
This commit is contained in:
Oliver Gierke
2015-04-01 13:10:07 +02:00
parent f8696a2879
commit 6f4e7f3703
6 changed files with 58 additions and 16 deletions

View File

@@ -22,7 +22,7 @@
<dist.key>DATAJPA</dist.key>
<eclipselink>2.5.1</eclipselink>
<eclipselink>2.5.2</eclipselink>
<hibernate>3.6.10.Final</hibernate>
<hsqldb1>1.8.0.10</hsqldb1>
<jpa>2.0.0</jpa>
@@ -245,11 +245,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<excludes>
<exclude>**/infrastructure/*</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>default-test</id>
@@ -286,7 +281,6 @@
<exclude>**/*UnitTests.java</exclude>
<exclude>**/OpenJpa*</exclude>
<exclude>**/EclipseLink*</exclude>
<exclude>**/infrastructure/*</exclude>
</excludes>
<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar</argLine>
</configuration>

View File

@@ -33,7 +33,13 @@ public class EclipseLinkMetamodelIntegrationTests extends MetamodelIntegrationTe
@Test
@Ignore
@Override
public void canAccessParametersByIndexForNativeQueries() {
public void canAccessParametersByIndexForNativeQueries() {}
}
/**
* TODO: Remove, once https://bugs.eclipse.org/bugs/show_bug.cgi?id=463663 is fixed.
*/
@Test
@Ignore
@Override
public void pathToEntityIsOfBindableTypeEntityType() {}
}

View File

@@ -0,0 +1,38 @@
/*
* Copyright 2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.jpa.infrastructure;
import org.junit.Ignore;
import org.junit.Test;
/**
* Hibernate-specific integration test using the JPA metamodel.
*
* @author Oliver Gierke
* @soundtrack Umphrey's McGee - Intentions Clear (Safety In Numbers)
*/
public class HibernateMetamodelIntegrationTests extends MetamodelIntegrationTests {
@Test
@Ignore
@Override
public void pathToEntityIsOfBindableTypeEntityType() {}
@Test
@Ignore
@Override
public void considersOneToOneAttributeAnAssociation() {}
}

View File

@@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({ "classpath:infrastructure.xml" })
public class MetamodelIntegrationTests {
public abstract class MetamodelIntegrationTests {
@PersistenceContext EntityManager em;

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013 the original author or authors.
* Copyright 2013-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
*/
package org.springframework.data.jpa.infrastructure;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
/**
@@ -25,4 +27,8 @@ import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration("classpath:openjpa.xml")
public class OpenJpaMetamodelIntegrationTests extends MetamodelIntegrationTests {
@Test
@Ignore
@Override
public void canAccessParametersByIndexForNativeQueries() {}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2011-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,11 +29,9 @@ public class EclipseLinkUserRepositoryFinderTests extends UserRepositoryFinderTe
@Ignore
@Override
public void executesNotInQueryCorrectly() throws Exception {
}
public void executesNotInQueryCorrectly() throws Exception {}
@Ignore
@Override
public void executesInKeywordForPageCorrectly() {
}
public void executesInKeywordForPageCorrectly() {}
}