From 49bc2a9a02ba66af92f37cad15178f2dcf087807 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 27 May 2016 16:30:50 +0200 Subject: [PATCH] Clean up warnings in PersistenceXmlParsingTests --- .../PersistenceXmlParsingTests.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java index 36a170aef7..12b6ddd9b5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2016 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. @@ -282,28 +282,21 @@ public class PersistenceXmlParsingTests { @Test public void testPersistenceUnitRootUrl() throws Exception { - PersistenceUnitReader reader = new PersistenceUnitReader( - new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); - - URL url = reader.determinePersistenceUnitRootUrl(new ClassPathResource( - "/org/springframework/orm/jpa/persistence-no-schema.xml")); + URL url = PersistenceUnitReader.determinePersistenceUnitRootUrl(new ClassPathResource("/org/springframework/orm/jpa/persistence-no-schema.xml")); assertNull(url); - url = reader.determinePersistenceUnitRootUrl(new ClassPathResource("/org/springframework/orm/jpa/META-INF/persistence.xml")); + url = PersistenceUnitReader.determinePersistenceUnitRootUrl(new ClassPathResource("/org/springframework/orm/jpa/META-INF/persistence.xml")); assertTrue("the containing folder should have been returned", url.toString().endsWith("/org/springframework/orm/jpa")); } @Test public void testPersistenceUnitRootUrlWithJar() throws Exception { - PersistenceUnitReader reader = new PersistenceUnitReader( - new PathMatchingResourcePatternResolver(), new JndiDataSourceLookup()); - ClassPathResource archive = new ClassPathResource("/org/springframework/orm/jpa/jpa-archive.jar"); String newRoot = "jar:" + archive.getURL().toExternalForm() + "!/META-INF/persist.xml"; Resource insideArchive = new UrlResource(newRoot); // make sure the location actually exists assertTrue(insideArchive.exists()); - URL url = reader.determinePersistenceUnitRootUrl(insideArchive); + URL url = PersistenceUnitReader.determinePersistenceUnitRootUrl(insideArchive); assertTrue("the archive location should have been returned", archive.getURL().sameFile(url)); }