From 8f4fb207d7cf7ade2000ee5c5b86d43535e7f00c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 15 Oct 2017 16:16:48 +0200
Subject: [PATCH] Reinstate CastorUnmarshallerTests.clearCollectionsFalse()

---
 .../springframework/oxm/castor/CastorUnmarshallerTests.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
index 5313a02df69..e5405cc6616 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -181,7 +181,6 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests<CastorMar
 	}
 
 	@Test
-	@Ignore("Fails on the build server for some reason")
 	public void clearCollectionsFalse() throws Exception {
 		Flights flights = new Flights();
 		flights.setFlight(new Flight[] {new Flight(), null});
@@ -190,8 +189,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests<CastorMar
 		Object result = unmarshalFlights();
 
 		assertSame("Result Flights is different object.", flights, result);
-		assertEquals("Result Flights has incorrect number of Flight.", 3, ((Flights) result).getFlightCount());
-		assertNull("Flight shouldn't have number.", flights.getFlight(0).getNumber());
+		assertEquals("Result Flights has incorrect number of Flights.", 3, ((Flights) result).getFlightCount());
 		assertNull("Null Flight was expected.", flights.getFlight()[1]);
 		testFlight(flights.getFlight()[2]);
 	}