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

Upgrade JiBX (and BCEL) towards support of 1.8 bytecode level

Browse Source 
This commit also drops the now-unused CUSTOM_COMPILATION test group and the outdated JavaVersion class.

Issue: SPR-10423
This commit is contained in:
Juergen Hoeller
2016-07-25 14:10:46 +02:00
parent 0aeb306b6d
commit 01110f678d
8 changed files with 25 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
View File

@@ -17,11 +17,10 @@
package org.springframework.oxm.jibx;
import java.util.ArrayList;
import java.util.List;
public class Flights {
protected List<FlightType> flightList = new ArrayList<>();
protected ArrayList<FlightType> flightList = new ArrayList<>();
public void addFlight(FlightType flight) {
flightList.add(flight);

21
spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 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.
@@ -16,19 +16,17 @@
package org.springframework.oxm.jibx;
import java.io.StringWriter;
import javax.xml.transform.stream.StreamResult;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.oxm.AbstractMarshallerTests;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import javax.xml.transform.stream.StreamResult;
import java.io.StringWriter;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
import static org.junit.Assert.*;
import static org.xmlunit.matchers.CompareMatcher.*;
/**
* NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by
@@ -41,7 +39,8 @@ public class JibxMarshallerTests extends AbstractMarshallerTests<JibxMarshaller>
@BeforeClass
public static void compilerAssumptions() {
Assume.group(TestGroup.CUSTOM_COMPILATION);
// JiBX compiler is currently not compatible with JDK 9
Assume.assumeTrue(System.getProperty("java.version").startsWith("1.8."));
}
@Override

9
spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 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.
@@ -19,12 +19,11 @@ package org.springframework.oxm.jibx;
import java.io.ByteArrayInputStream;
import javax.xml.transform.stream.StreamSource;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.oxm.AbstractUnmarshallerTests;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.*;
@@ -41,9 +40,11 @@ public class JibxUnmarshallerTests extends AbstractUnmarshallerTests<JibxMarshal
"<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
"<tns:flight><tns:airline>Air Libert\u00e9</tns:airline><tns:number>42</tns:number></tns:flight></tns:flights>";
@BeforeClass
public static void compilerAssumptions() {
Assume.group(TestGroup.CUSTOM_COMPILATION);
// JiBX compiler is currently not compatible with JDK 9
Assume.assumeTrue(System.getProperty("java.version").startsWith("1.8."));
}