BJ-86: Up damsel, fix test (#11)

This commit is contained in:
Inal Arsanukaev 2017-02-07 18:29:25 +03:00 committed by GitHub
parent 4b641c69f3
commit 18de824b7d
2 changed files with 8 additions and 16 deletions

View File

@ -12,7 +12,7 @@
<groupId>com.rbkmoney</groupId> <groupId>com.rbkmoney</groupId>
<artifactId>eventstock-client</artifactId> <artifactId>eventstock-client</artifactId>
<version>1.0.4</version> <version>1.0.5</version>
<dependencies> <dependencies>
<!--RBK libs--> <!--RBK libs-->
@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>com.rbkmoney</groupId> <groupId>com.rbkmoney</groupId>
<artifactId>damsel</artifactId> <artifactId>damsel</artifactId>
<version>1.99-557f549</version> <version>1.132-27bc11c</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--Thirdparty libs--> <!--Thirdparty libs-->
@ -70,4 +70,4 @@
</build> </build>
</project> </project>

View File

@ -5,12 +5,8 @@ import com.rbkmoney.damsel.domain.Currency;
import com.rbkmoney.damsel.event_stock.EventConstraint; import com.rbkmoney.damsel.event_stock.EventConstraint;
import com.rbkmoney.damsel.event_stock.EventRange; import com.rbkmoney.damsel.event_stock.EventRange;
import com.rbkmoney.damsel.payment_processing.Event; import com.rbkmoney.damsel.payment_processing.Event;
import com.rbkmoney.eventstock.client.*;
import com.rbkmoney.damsel.base.InvalidRequest; import com.rbkmoney.damsel.base.InvalidRequest;
import com.rbkmoney.damsel.domain.Currency;
import com.rbkmoney.damsel.domain.*;
import com.rbkmoney.damsel.event_stock.*; import com.rbkmoney.damsel.event_stock.*;
import com.rbkmoney.damsel.event_stock.EventRange;
import com.rbkmoney.damsel.payment_processing.*; import com.rbkmoney.damsel.payment_processing.*;
import com.rbkmoney.eventstock.client.DefaultSubscriberConfig; import com.rbkmoney.eventstock.client.DefaultSubscriberConfig;
import com.rbkmoney.eventstock.client.EventFilter; import com.rbkmoney.eventstock.client.EventFilter;
@ -22,9 +18,7 @@ import com.rbkmoney.thrift.filter.converter.TemporalConverter;
import com.rbkmoney.thrift.filter.rule.PathConditionRule; import com.rbkmoney.thrift.filter.rule.PathConditionRule;
import com.rbkmoney.woody.api.event.*; import com.rbkmoney.woody.api.event.*;
import com.rbkmoney.woody.api.trace.MetadataProperties; import com.rbkmoney.woody.api.trace.MetadataProperties;
import com.rbkmoney.woody.api.trace.context.TraceContext;
import com.rbkmoney.woody.thrift.impl.http.THServiceBuilder; import com.rbkmoney.woody.thrift.impl.http.THServiceBuilder;
import com.rbkmoney.woody.thrift.impl.http.THSpawnClientBuilder;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -33,7 +27,6 @@ import org.slf4j.LoggerFactory;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.ByteBuffer;
import java.time.Instant; import java.time.Instant;
import java.util.*; import java.util.*;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@ -259,14 +252,13 @@ public class ClientTest extends AbstractTest {
new InvoiceCreated( new InvoiceCreated(
new Invoice( new Invoice(
id+"", id+"",
new PartyRef("1", 1), "kek_id",
"1",
"kek",
1, 1,
"kek_time",
InvoiceStatus.unpaid(new InvoiceUnpaid()), InvoiceStatus.unpaid(new InvoiceUnpaid()),
"kek", new InvoiceDetails("kek_product"),
"kek", "kek_time",
new Cash(100, new Currency("", "RUB", (short) 1, (short) 0)) new Cash(100, new CurrencyRef("RUB"))
) )
) )
) )