Prosoft Git

killbill-aplcache

Fix broken tests after e96b39ae50b5b12ab64f3aaaebe915ff7dc48d0f

10/14/2015 8:12:32 PM
stephane brossier

stephane brossier

Commit: 0fe4b27

Tree: a33b29a

Parents: d6185fb

Changes

payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java 4(+4 -0)

payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java 39(+20 -19)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java 4(+2 -2)

util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java 10(+6 -4)

Details

payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java 4(+4 -0) 

diff --git a/payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java b/payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java
index 2b3ade2..54b5848 100644
--- a/payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java
+++ b/payment/src/main/java/org/killbill/billing/payment/provider/DefaultNoOpPaymentInfoPlugin.java
@@ -161,6 +161,9 @@ public class DefaultNoOpPaymentInfoPlugin implements PaymentTransactionInfoPlugi
         if (gatewayError != null ? !gatewayError.equals(that.gatewayError) : that.gatewayError != null) {
             return false;
         }
+        if (gatewayErrorCode != null ? !gatewayErrorCode.equals(that.gatewayErrorCode) : that.gatewayErrorCode != null) {
+            return false;
+        }
         if (transactionType != null ? !transactionType.equals(that.transactionType) : that.transactionType != null) {
             return false;
         }
@@ -187,6 +190,7 @@ public class DefaultNoOpPaymentInfoPlugin implements PaymentTransactionInfoPlugi
         result = 31 * result + (createdDate != null ? createdDate.hashCode() : 0);
         result = 31 * result + (status != null ? status.hashCode() : 0);
         result = 31 * result + (gatewayError != null ? gatewayError.hashCode() : 0);
+        result = 31 * result + (gatewayErrorCode != null ? gatewayErrorCode.hashCode() : 0);
         result = 31 * result + (currency != null ? currency.hashCode() : 0);
         return result;
     }

payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java 39(+20 -19) 

diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index f843590..cea0072 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -50,6 +50,7 @@ import org.testng.annotations.Test;
 import com.google.common.collect.ImmutableList;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
@@ -114,8 +115,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
         assertEquals(payment.getTransactions().get(0).getTransactionStatus(), TransactionStatus.SUCCESS);
         assertEquals(payment.getTransactions().get(0).getTransactionType(), TransactionType.PURCHASE);
-        assertNull(payment.getTransactions().get(0).getGatewayErrorMsg());
-        assertNull(payment.getTransactions().get(0).getGatewayErrorCode());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorMsg());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorCode());
     }
 
     @Test(groups = "slow")
@@ -150,8 +151,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
         assertEquals(payment.getTransactions().get(0).getTransactionStatus(), TransactionStatus.PAYMENT_FAILURE);
         assertEquals(payment.getTransactions().get(0).getTransactionType(), TransactionType.PURCHASE);
-        assertNull(payment.getTransactions().get(0).getGatewayErrorMsg());
-        assertNull(payment.getTransactions().get(0).getGatewayErrorCode());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorMsg());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorCode());
     }
 
     @Test(groups = "slow")
@@ -186,8 +187,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
         assertEquals(payment.getTransactions().get(0).getTransactionStatus(), TransactionStatus.SUCCESS);
         assertEquals(payment.getTransactions().get(0).getTransactionType(), TransactionType.AUTHORIZE);
-        assertNull(payment.getTransactions().get(0).getGatewayErrorMsg());
-        assertNull(payment.getTransactions().get(0).getGatewayErrorCode());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorMsg());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorCode());
 
         final Payment payment2 = paymentApi.createCapture(account, payment.getId(), captureAmount, Currency.AED, transactionExternalKey2,
                                                           ImmutableList.<PluginProperty>of(), callContext);
@@ -211,8 +212,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
         assertEquals(payment2.getTransactions().get(1).getTransactionStatus(), TransactionStatus.SUCCESS);
         assertEquals(payment2.getTransactions().get(1).getTransactionType(), TransactionType.CAPTURE);
-        assertNull(payment2.getTransactions().get(1).getGatewayErrorMsg());
-        assertNull(payment2.getTransactions().get(1).getGatewayErrorCode());
+        assertNotNull(payment2.getTransactions().get(1).getGatewayErrorMsg());
+        assertNotNull(payment2.getTransactions().get(1).getGatewayErrorCode());
     }
 
     @Test(groups = "slow")
@@ -261,8 +262,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
         assertEquals(payment4.getTransactions().get(3).getProcessedCurrency(), Currency.USD);
         assertEquals(payment4.getTransactions().get(3).getTransactionStatus(), TransactionStatus.SUCCESS);
         assertEquals(payment4.getTransactions().get(3).getTransactionType(), TransactionType.REFUND);
-        assertNull(payment4.getTransactions().get(3).getGatewayErrorMsg());
-        assertNull(payment4.getTransactions().get(3).getGatewayErrorCode());
+        assertNotNull(payment4.getTransactions().get(3).getGatewayErrorMsg());
+        assertNotNull(payment4.getTransactions().get(3).getGatewayErrorCode());
     }
 
     @Test(groups = "slow")
@@ -309,8 +310,8 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
         assertEquals(payment.getTransactions().get(0).getTransactionStatus(), TransactionStatus.SUCCESS);
         assertEquals(payment.getTransactions().get(0).getTransactionType(), TransactionType.PURCHASE);
-        assertNull(payment.getTransactions().get(0).getGatewayErrorMsg());
-        assertNull(payment.getTransactions().get(0).getGatewayErrorCode());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorMsg());
+        assertNotNull(payment.getTransactions().get(0).getGatewayErrorCode());
 
         // Not stricly an API test but interesting to verify that we indeed went through the attempt logic
         final List<PaymentAttemptModelDao> attempts = paymentDao.getPaymentAttempts(payment.getExternalKey(), internalCallContext);
@@ -698,7 +699,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
             final String payment3TransactionExternalKey = UUID.randomUUID().toString();
 
             final Payment pendingPayment1 = createPayment(transactionType, null, payment1ExternalKey, payment1TransactionExternalKey, requestedAmount, PaymentPluginStatus.PENDING);
-            Assert.assertNotNull(pendingPayment1);
+            assertNotNull(pendingPayment1);
             Assert.assertEquals(pendingPayment1.getExternalKey(), payment1ExternalKey);
             Assert.assertEquals(pendingPayment1.getTransactions().size(), 1);
             Assert.assertEquals(pendingPayment1.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
@@ -709,7 +710,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
             // Attempt to create a second transaction for the same payment, but with a different transaction external key
             final Payment pendingPayment2 = createPayment(transactionType, null, payment1ExternalKey, payment2TransactionExternalKey, requestedAmount, PaymentPluginStatus.PENDING);
-            Assert.assertNotNull(pendingPayment2);
+            assertNotNull(pendingPayment2);
             Assert.assertEquals(pendingPayment2.getId(), pendingPayment1.getId());
             Assert.assertEquals(pendingPayment2.getExternalKey(), payment1ExternalKey);
             Assert.assertEquals(pendingPayment2.getTransactions().size(), 2);
@@ -742,7 +743,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
 
             // Attempt to create a second transaction for a different payment
             final Payment pendingPayment3 = createPayment(transactionType, null, payment2ExternalKey, payment3TransactionExternalKey, requestedAmount, PaymentPluginStatus.PENDING);
-            Assert.assertNotNull(pendingPayment3);
+            assertNotNull(pendingPayment3);
             Assert.assertNotEquals(pendingPayment3.getId(), pendingPayment1.getId());
             Assert.assertEquals(pendingPayment3.getExternalKey(), payment2ExternalKey);
             Assert.assertEquals(pendingPayment3.getTransactions().size(), 1);
@@ -774,7 +775,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
         final Iterable<PluginProperty> pendingPluginProperties = ImmutableList.<PluginProperty>of(new PluginProperty(MockPaymentProviderPlugin.PLUGIN_PROPERTY_PAYMENT_PLUGIN_STATUS_OVERRIDE, TransactionStatus.PENDING.toString(), false));
 
         final Payment payment = createPayment(TransactionType.PURCHASE, null, paymentExternalKey, paymentTransactionExternalKey, requestedAmount, PaymentPluginStatus.PROCESSED);
-        Assert.assertNotNull(payment);
+        assertNotNull(payment);
         Assert.assertEquals(payment.getExternalKey(), paymentExternalKey);
         Assert.assertEquals(payment.getTransactions().size(), 1);
         Assert.assertEquals(payment.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
@@ -852,7 +853,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
         final String paymentTransactionExternalKey = UUID.randomUUID().toString();
 
         final Payment pendingPayment = createPayment(transactionType, null, paymentExternalKey, paymentTransactionExternalKey, requestedAmount, PaymentPluginStatus.PENDING);
-        Assert.assertNotNull(pendingPayment);
+        assertNotNull(pendingPayment);
         Assert.assertEquals(pendingPayment.getExternalKey(), paymentExternalKey);
         Assert.assertEquals(pendingPayment.getTransactions().size(), 1);
         Assert.assertEquals(pendingPayment.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
@@ -865,7 +866,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
         verifyPaymentViaGetPath(pendingPayment);
 
         final Payment pendingPayment2 = createPayment(transactionType, pendingPayment.getId(), paymentExternalKey, paymentTransactionExternalKey, pendingAmount, PaymentPluginStatus.PENDING);
-        Assert.assertNotNull(pendingPayment2);
+        assertNotNull(pendingPayment2);
         Assert.assertEquals(pendingPayment2.getExternalKey(), paymentExternalKey);
         Assert.assertEquals(pendingPayment2.getTransactions().size(), 1);
         Assert.assertEquals(pendingPayment2.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);
@@ -877,7 +878,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
         verifyPaymentViaGetPath(pendingPayment2);
 
         final Payment completedPayment = createPayment(transactionType, pendingPayment.getId(), paymentExternalKey, paymentTransactionExternalKey, pendingAmount, PaymentPluginStatus.PROCESSED);
-        Assert.assertNotNull(completedPayment);
+        assertNotNull(completedPayment);
         Assert.assertEquals(completedPayment.getExternalKey(), paymentExternalKey);
         Assert.assertEquals(completedPayment.getTransactions().size(), 1);
         Assert.assertEquals(completedPayment.getTransactions().get(0).getAmount().compareTo(requestedAmount), 0);

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java
index 245a380..2e60d4b 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagCreationEvent.java
@@ -38,7 +38,7 @@ public class TestDefaultControlTagCreationEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -69,7 +69,7 @@ public class TestDefaultControlTagCreationEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java
index e64092f..77ecadb 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionCreationEvent.java
@@ -34,7 +34,7 @@ public class TestDefaultControlTagDefinitionCreationEvent extends UtilTestSuiteN
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -60,7 +60,7 @@ public class TestDefaultControlTagDefinitionCreationEvent extends UtilTestSuiteN
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java
index f78a0aa..8141bd3 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDefinitionDeletionEvent.java
@@ -34,7 +34,7 @@ public class TestDefaultControlTagDefinitionDeletionEvent extends UtilTestSuiteN
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -60,7 +60,7 @@ public class TestDefaultControlTagDefinitionDeletionEvent extends UtilTestSuiteN
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java
index c9ff86c..95282e2 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultControlTagDeletionEvent.java
@@ -38,7 +38,7 @@ public class TestDefaultControlTagDeletionEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -69,7 +69,7 @@ public class TestDefaultControlTagDeletionEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java
index 2c98e20..669a7a6 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagCreationEvent.java
@@ -38,7 +38,7 @@ public class TestDefaultUserTagCreationEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -69,7 +69,7 @@ public class TestDefaultUserTagCreationEvent extends UtilTestSuiteNoDB {
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java
index 93bce4b..9081914 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionCreationEvent.java
@@ -34,7 +34,7 @@ public class TestDefaultUserTagDefinitionCreationEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -61,7 +61,7 @@ public class TestDefaultUserTagDefinitionCreationEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java
index e80c620..ccbea40 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDefinitionDeletionEvent.java
@@ -34,7 +34,7 @@ public class TestDefaultUserTagDefinitionDeletionEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -60,7 +60,7 @@ public class TestDefaultUserTagDefinitionDeletionEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java 4(+2 -2) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java
index 29b4314..fcfe155 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestDefaultUserTagDeletionEvent.java
@@ -38,7 +38,7 @@ public class TestDefaultUserTagDeletionEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();
 
@@ -69,7 +69,7 @@ public class TestDefaultUserTagDeletionEvent extends UtilTestSuiteNoDB
         final UUID tagDefinitionId = UUID.randomUUID();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
-        final boolean controlTag = true;
+        final boolean controlTag = false;
         final TagDefinition tagDefinition = new DefaultTagDefinition(tagDefinitionId, tagDefinitionName, tagDefinitionDescription, controlTag);
         final UUID userToken = UUID.randomUUID();

util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java 10(+6 -4) 

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java
index 4d64b23..76871bf 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/user/TestTagEventBuilder.java
@@ -18,6 +18,8 @@ package org.killbill.billing.util.tag.api.user;
 
 import java.util.UUID;
 
+import org.killbill.billing.util.tag.ControlTag;
+import org.killbill.billing.util.tag.ControlTagType;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -80,7 +82,7 @@ public class TestTagEventBuilder extends UtilTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testNewControlTagDefinitionCreationEvent() throws Exception {
-        final UUID tagDefinitionId = UUID.randomUUID();
+        final UUID tagDefinitionId = ControlTagType.AUTO_PAY_OFF.getId();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
         final boolean controlTag = true;
@@ -99,7 +101,7 @@ public class TestTagEventBuilder extends UtilTestSuiteNoDB {
 
     @Test(groups = "fast")
     public void testNewControlTagDefinitionDeletionEvent() throws Exception {
-        final UUID tagDefinitionId = UUID.randomUUID();
+        final UUID tagDefinitionId = ControlTagType.AUTO_PAY_OFF.getId();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
         final boolean controlTag = true;
@@ -165,7 +167,7 @@ public class TestTagEventBuilder extends UtilTestSuiteNoDB {
         final UUID tagId = UUID.randomUUID();
         final UUID objectId = UUID.randomUUID();
         final ObjectType objectType = ObjectType.ACCOUNT_EMAIL;
-        final UUID tagDefinitionId = UUID.randomUUID();
+        final UUID tagDefinitionId = ControlTagType.AUTO_PAY_OFF.getId();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
         final boolean controlTag = true;
@@ -187,7 +189,7 @@ public class TestTagEventBuilder extends UtilTestSuiteNoDB {
         final UUID tagId = UUID.randomUUID();
         final UUID objectId = UUID.randomUUID();
         final ObjectType objectType = ObjectType.ACCOUNT_EMAIL;
-        final UUID tagDefinitionId = UUID.randomUUID();
+        final UUID tagDefinitionId = ControlTagType.AUTO_PAY_OFF.getId();
         final String tagDefinitionName = UUID.randomUUID().toString();
         final String tagDefinitionDescription = UUID.randomUUID().toString();
         final boolean controlTag = true;

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github