From 158cb346a5d6512da44685ea42fe4f0110e50151 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 26 Jun 2014 14:30:57 +0200 Subject: [PATCH] Re-enable OpenJPA + AspectJ tests With the upgrade to JDK 8, the OpenJPA/AspectJ integration tests now pass again. Thus, we are re-enabling these tests. Issue: SPR-10333 --- build.gradle | 1 + ...yManagerFactoryWithAspectJWeavingIntegrationTests.java | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 53e80a51683..f1603993cdf 100644 --- a/build.gradle +++ b/build.gradle @@ -725,6 +725,7 @@ project("spring-orm") { } optional("javax.servlet:javax.servlet-api:3.0.1") testCompile("commons-dbcp:commons-dbcp:1.4") + testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}") } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java index a35fdac8cad..cb28aee7def 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,14 @@ package org.springframework.orm.jpa.openjpa; -import org.junit.Ignore; /** - * Test that AspectJ weaving (in particular the currently shipped aspects) work with JPA - * (see SPR-3873 for more details). + * Test that AspectJ weaving (in particular the currently shipped aspects) works + * with JPA (see SPR-3873 for more details). * * @author Ramnivas Laddad * @author Chris Beams */ -@Ignore("This test causes gradle to hang. See SPR-10333.") public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests { @Override