killbill-memoizeit

diff --git a/util/src/main/java/org/killbill/billing/util/broadcast/dao/BroadcastModelDao.java b/util/src/main/java/org/killbill/billing/util/broadcast/dao/BroadcastModelDao.java
index 14938ea..f480b12 100644
--- a/util/src/main/java/org/killbill/billing/util/broadcast/dao/BroadcastModelDao.java
+++ b/util/src/main/java/org/killbill/billing/util/broadcast/dao/BroadcastModelDao.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2014-2015 Groupon, Inc
- * Copyright 2014-2015 The Billing Project, LLC
+ * Copyright 2014-2017 Groupon, Inc
+ * Copyright 2014-2017 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -63,4 +63,17 @@ public class BroadcastModelDao {
     public String getCreatedBy() {
         return createdBy;
     }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("BroadcastModelDao{");
+        sb.append("recordId=").append(recordId);
+        sb.append(", serviceName='").append(serviceName).append('\'');
+        sb.append(", type='").append(type).append('\'');
+        sb.append(", event='").append(event).append('\'');
+        sb.append(", createdDate=").append(createdDate);
+        sb.append(", createdBy='").append(createdBy).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
 }

diff --git a/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java b/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
index 777cea8..f3ff6e6 100644
--- a/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
+++ b/util/src/test/java/org/killbill/billing/util/broadcast/dao/TestBroadcastDao.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2014-2015 Groupon, Inc
- * Copyright 2014-2015 The Billing Project, LLC
+ * Copyright 2014-2017 Groupon, Inc
+ * Copyright 2014-2017 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -29,8 +29,7 @@ public class TestBroadcastDao extends UtilTestSuiteWithEmbeddedDB {
 
     @Test(groups = "slow")
     public void testBasic() throws Exception {
-
-        DateTime now = clock.getUTCNow();
+        final DateTime now = clock.getUTCNow();
 
         final BroadcastModelDao b1 = new BroadcastModelDao("svc1", "type1", "{attribute: kewl}", now, "tester");
         broadcastDao.create(b1);
@@ -43,8 +42,7 @@ public class TestBroadcastDao extends UtilTestSuiteWithEmbeddedDB {
         final List<BroadcastModelDao> all = broadcastDao.getLatestEntriesFrom(0L);
         assertEquals(all.size(), 1);
 
-        final List<BroadcastModelDao> none = broadcastDao.getLatestEntriesFrom(1L);
-        assertEquals(none.size(), 0);
-
+        final List<BroadcastModelDao> none = broadcastDao.getLatestEntriesFrom(res.getRecordId());
+        assertEquals(none.size(), 0, "Invalid entries: " + none.toString());
     }
 }

diff --git a/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java b/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
index b83c1fa..77fd294 100644
--- a/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
+++ b/util/src/test/java/org/killbill/billing/util/security/api/TestDefaultSecurityApi.java
@@ -1,7 +1,9 @@
 /*
- * Copyright 2010-2013 Ning, Inc.
+ * Copyright 2010-2014 Ning, Inc.
+ * Copyright 2014-2017 Groupon, Inc
+ * Copyright 2014-2017 The Billing Project, LLC
  *
- * Ning licenses this file to you under the Apache License, version 2.0
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License.  You may obtain a copy of the License at:
  *
@@ -36,8 +38,9 @@ public class TestDefaultSecurityApi extends UtilTestSuiteNoDB {
         // We don't want the Guice injected one (it has Shiro disabled)
         final SecurityApi securityApi = new DefaultSecurityApi(null);
 
+        logout();
         final Set<Permission> anonsPermissions = securityApi.getCurrentUserPermissions(callContext);
-        Assert.assertEquals(anonsPermissions.size(), 0);
+        Assert.assertEquals(anonsPermissions.size(), 0, "Invalid permissions: " + anonsPermissions);
 
         login("pierre");
         final Set<Permission> pierresPermissions = securityApi.getCurrentUserPermissions(callContext);