treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lim-exporter CLS-262 поправил тесты

Browse source
This commit is contained in:
AKurakin 2023-05-24 10:53:28 +03:00
parent ec619899f6
commit af54945fde
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterServiceTest.java
View file

@ -1,6 +1,7 @@
package ru.spcex.clearing.lim.exporter.services;
import org.junit.jupiter.api.Test;
import org.springframework.util.StringUtils;
import ru.clearing.classes.statics.data.registry.Registry;
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
import ru.spcex.clearing.lim.exporter.AbstractServiceTest;
@ -58,7 +59,8 @@ class MoneyExporterServiceTest extends AbstractServiceTest {
registry.setTradingClearingRegistry(tradingClearingRegistry);
registry.setRegistryDesignation("A");
registry.setRegistryInstrumentType("M");
registry.setRegistryCode("F");
registry.setRegistryUnit("F");
registry.setClearingCode(clearingCode(registry));
registry.setClearingDate(currentDate);
registry.setSecuritySymbol("RUB");
registry.setSecurityId(securityId);
@ -73,11 +75,27 @@ class MoneyExporterServiceTest extends AbstractServiceTest {
registry.setTradingClearingRegistry(tradingClearingRegistry);
registry.setRegistryDesignation("D");
registry.setRegistryInstrumentType("M");
registry.setRegistryCode("T");
registry.setRegistryUnit("T");
registry.setClearingCode(clearingCode(registry));
registry.setClearingDate(currentDate);
registry.setSecuritySymbol("RUB");
registry.setSecurityId(securityId);
registry.setTradingClearingRegistryId(securityId);
return registry;
}
// see clearing-service ReistryUtil:
public static String clearingCode(Registry ofRegistry) {
return clearingCode(ofRegistry.getRegistryDesignation(), ofRegistry.getRegistryInstrumentType(), ofRegistry.getRegistryCapacity(), ofRegistry.getRegistryUnit());
}
public static String clearingCode(String registryDesignation, String registryInstrumentType, String registryCapacity, String registryUnit) {
if (StringUtils.isEmpty(registryDesignation)) registryDesignation = "-";
if (StringUtils.isEmpty(registryInstrumentType)) registryInstrumentType = "-";
if (StringUtils.isEmpty(registryCapacity)) registryCapacity = "-";
if (StringUtils.isEmpty(registryUnit)) registryUnit = "-";
return registryDesignation + registryInstrumentType + registryCapacity + registryUnit;
}
}

4
clearing-parent/lim-exporter/src/test/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterServiceTest.java
View file

@ -11,6 +11,7 @@ import java.util.Collection;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static ru.spcex.clearing.lim.exporter.services.MoneyExporterServiceTest.clearingCode;
import static ru.spcex.clearing.test.TestUtils.clearAllInImdg;
class SecurityExporterServiceTest extends AbstractServiceTest {
@ -60,7 +61,8 @@ class SecurityExporterServiceTest extends AbstractServiceTest {
registry.setTradingClearingRegistry(tradingClearingRegistry);
registry.setRegistryDesignation("A");
registry.setRegistryInstrumentType("S");
registry.setRegistryCode("T");
registry.setRegistryUnit("T");
registry.setClearingCode(clearingCode(registry));
registry.setClearingDate(currentDate);
registry.setSecuritySymbol("RUB");
registry.setSecurityId(securityId);