killbill-aplcache

diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
index 9f83fdf..ba95df2 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
@@ -16,20 +16,21 @@
 
 package com.ning.billing.invoice.dao;
 
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 import java.io.IOException;
+
 import org.apache.commons.io.IOUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
 import com.ning.billing.invoice.glue.InvoiceModuleMock;
-import com.ning.billing.util.eventbus.DefaultEventBusService;
 import com.ning.billing.util.eventbus.BusService;
-import sun.jvm.hotspot.utilities.Assert;
-
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import com.ning.billing.util.eventbus.DefaultEventBusService;
 
 public abstract class InvoiceDaoTestBase {
     protected InvoiceDao invoiceDao;

diff --git a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
index 88fdd1d..21a66e3 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
@@ -94,6 +94,7 @@ public class TestNextBillingDateNotifier {
 
 	public static class NextBillingEventListener {
 		private int eventCount=0;
+		private NextBillingDateEvent event;
 
 		public int getEventCount() {
 			return eventCount;
@@ -102,13 +103,18 @@ public class TestNextBillingDateNotifier {
 		@Subscribe
 		public synchronized void processEvent(NextBillingDateEvent event) {
 			eventCount++;
+			this.event = event;
 			//log.debug("Got event {} {}", event.name, event.value);
 		}
+		
+		public NextBillingDateEvent getLatestEvent() {
+			return event;
+		}
 	}
 
 	@Test(enabled=true, groups="slow")
 	public void test() throws Exception {
-		final UUID subscriptionId = new UUID(0L,1L);
+		final UUID subscriptionId = new UUID(0L,1000L);
 		final DateTime now = new DateTime();
 		final DateTime readyTime = now.plusMillis(2000);
 
@@ -140,5 +146,6 @@ public class TestNextBillingDateNotifier {
 	        });
 
 		Assert.assertEquals(listener.getEventCount(), 1);
+		Assert.assertEquals(listener.getLatestEvent().getSubscriptionId(), subscriptionId);
 	}
 }