killbill-uncached

Fix jruby beatrix tests (TestJrubyNotificationPlugin and

8/20/2013 1:26:34 PM

Details

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyPaymentPlugin.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyPaymentPlugin.java
index f392726..20396bc 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyPaymentPlugin.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/osgi/TestJrubyPaymentPlugin.java
@@ -52,8 +52,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
     @Inject
     private OSGIServiceRegistration<PaymentPluginApi> paymentPluginApiOSGIServiceRegistration;
 
-    // STEPH_ENT reenable All tests
-    @BeforeClass(groups = "slow", enabled = false)
+    @BeforeClass(groups = "slow")
     public void beforeClass() throws Exception {
 
 
@@ -68,7 +67,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
 
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testProcessPayment() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -93,7 +92,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
         assertEquals(res.getStatus(), PaymentPluginStatus.PROCESSED);
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testGetPaymentInfo() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -117,7 +116,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
     }
 
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testProcessRefund() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -140,7 +139,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
         assertEquals(res.getStatus(), RefundPluginStatus.PROCESSED);
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testAddPaymentMethod() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -152,14 +151,14 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
     }
 
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testDeletePaymentMethod() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
         api.deletePaymentMethod(UUID.randomUUID(), UUID.randomUUID(), callContext);
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testGetPaymentMethodDetail() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -174,7 +173,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
         assertEquals(res.getProperties().get(1).getValue(), "value2");
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testSetDefaultPaymentMethod() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
@@ -182,7 +181,7 @@ public class TestJrubyPaymentPlugin extends TestOSGIBase {
         api.setDefaultPaymentMethod(UUID.randomUUID(), UUID.randomUUID(), callContext);
     }
 
-    @Test(groups = "slow", enabled = false)
+    @Test(groups = "slow", enabled = true)
     public void testGetPaymentMethods() throws Exception {
 
         PaymentPluginApi api = getTestPluginPaymentApi();
diff --git a/beatrix/src/test/resources/killbill-notification-test.tar.gz b/beatrix/src/test/resources/killbill-notification-test.tar.gz
index c0c64eb..0d464d2 100644
Binary files a/beatrix/src/test/resources/killbill-notification-test.tar.gz and b/beatrix/src/test/resources/killbill-notification-test.tar.gz differ
diff --git a/beatrix/src/test/resources/killbill-payment-test.tar.gz b/beatrix/src/test/resources/killbill-payment-test.tar.gz
index 91c8088..9216c71 100644
Binary files a/beatrix/src/test/resources/killbill-payment-test.tar.gz and b/beatrix/src/test/resources/killbill-payment-test.tar.gz differ