NET-385, NET-386: update unit test to work with new aggregates.

solarnet/common/src/test/java/net/solarnetwork/central/security/test/BasicSecurityPolicyTests.java

@@ -41,10 +41,10 @@
 import org.junit.Test;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import net.solarnetwork.domain.datum.Aggregation;
 import net.solarnetwork.central.domain.LocationPrecision;
 import net.solarnetwork.central.security.BasicSecurityPolicy;
 import net.solarnetwork.codec.JsonUtils;
+import net.solarnetwork.domain.datum.Aggregation;
 
 /**
  * Test cases for the {@link BasicSecurityPolicy} class.
@@ -226,9 +226,9 @@ public void buildMergedMinAggregationPolicy() {
 				.withMergedPolicy(patch).build();
 		assertThat("Minimum aggregation", policy.getMinAggregation(), is(Aggregation.Day));
 		assertThat("Minimum aggregation set", policy.getAggregations(),
-				contains(Aggregation.Day, Aggregation.DayOfWeek, Aggregation.SeasonalDayOfWeek,
-						Aggregation.Week, Aggregation.WeekOfYear, Aggregation.Month, Aggregation.Year,
-						Aggregation.RunningTotal));
+				containsInAnyOrder(Aggregation.Day, Aggregation.DayOfYear, Aggregation.DayOfWeek,
+						Aggregation.SeasonalDayOfWeek, Aggregation.Week, Aggregation.WeekOfYear,
+						Aggregation.Month, Aggregation.Year, Aggregation.RunningTotal));
 		try {
 			policy.getAggregations().add(Aggregation.Minute);
 			fail("Aggregation set should be immutable");