Projects >> braintree_java >>fd99036637d7f5a6614f5f0d210d66d41a5ea265

Chunk
Conflicting content
            venmoSdkPaymentMethodCode(VenmoSdk.PaymentMethodCode.Invalid.code);

        Result result = gateway.creditCard().create(request);
<<<<<<< HEAD:src/test/java/com/braintreegateway/integrationtest/CreditCardIT.java
        assertFalse(result.isSuccess());
=======
        ValidationErrorCode errorCode = result.getErrors().forObject("creditCard")
          .onField("venmoSdkPaymentMethodCode").get(0).getCode();

        Assert.assertFalse(result.isSuccess());
        Assert.assertEquals("Invalid VenmoSDK payment method code", result.getMessage());
        Assert.assertEquals(ValidationErrorCode.CREDIT_CARD_INVALID_VENMO_SDK_PAYMENT_METHOD_CODE, errorCode);
>>>>>>> 10dce7cfd08aad2d7680ce912c46dce55f29b726:test/com/braintreegateway/CreditCardTest.java
    }

    @Test
Solution content
    }

    @Test
            venmoSdkPaymentMethodCode(VenmoSdk.PaymentMethodCode.Invalid.code);

        Result result = gateway.creditCard().create(request);
        ValidationErrorCode errorCode = result.getErrors().forObject("creditCard")
            .onField("venmoSdkPaymentMethodCode").get(0).getCode();

        assertFalse(result.isSuccess());
        assertEquals("Invalid VenmoSDK payment method code", result.getMessage());
        assertEquals(ValidationErrorCode.CREDIT_CARD_INVALID_VENMO_SDK_PAYMENT_METHOD_CODE, errorCode);
File
CreditCardIT.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable