root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Reinstate CastorUnmarshallerTests.clearCollectionsFalse()

This commit is contained in:
Sam Brannen 2017-10-15 16:16:48 +02:00
parent e9367a11f6
commit 8f4fb207d7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -181,7 +181,6 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests<CastorMar
} }
@Test @Test
@Ignore("Fails on the build server for some reason")
public void clearCollectionsFalse() throws Exception { public void clearCollectionsFalse() throws Exception {
Flights flights = new Flights(); Flights flights = new Flights();
flights.setFlight(new Flight[] {new Flight(), null}); flights.setFlight(new Flight[] {new Flight(), null});
@ -190,8 +189,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests<CastorMar
Object result = unmarshalFlights(); Object result = unmarshalFlights();
assertSame("Result Flights is different object.", flights, result); assertSame("Result Flights is different object.", flights, result);
assertEquals("Result Flights has incorrect number of Flight.", 3, ((Flights) result).getFlightCount()); assertEquals("Result Flights has incorrect number of Flights.", 3, ((Flights) result).getFlightCount());
assertNull("Flight shouldn't have number.", flights.getFlight(0).getNumber());
assertNull("Null Flight was expected.", flights.getFlight()[1]); assertNull("Null Flight was expected.", flights.getFlight()[1]);
testFlight(flights.getFlight()[2]); testFlight(flights.getFlight()[2]);
} }