Fix CI deploy (#5596)

This commit is contained in:
James Agnew 2024-01-15 18:08:04 -05:00 committed by GitHub
parent 878e27b06d
commit 5a747051de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View File

@ -48,10 +48,10 @@ public class MdmLinkExpandSvc implements IMdmLinkExpandSvc {
private static final Logger ourLog = Logs.getMdmTroubleshootingLog(); private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
@Autowired @Autowired
private IMdmLinkDao myMdmLinkDao; IMdmLinkDao myMdmLinkDao;
@Autowired @Autowired
private IIdHelperService myIdHelperService; IIdHelperService myIdHelperService;
public MdmLinkExpandSvc() {} public MdmLinkExpandSvc() {}

View File

@ -8,6 +8,7 @@ import ca.uhn.fhir.mdm.dao.IMdmLinkDao;
import ca.uhn.fhir.mdm.model.MdmPidTuple; import ca.uhn.fhir.mdm.model.MdmPidTuple;
import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId; import ca.uhn.fhir.rest.api.server.storage.IResourcePersistentId;
import jakarta.annotation.Nonnull; import jakarta.annotation.Nonnull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
@ -57,6 +58,13 @@ class MdmLinkExpandSvcTest {
@InjectMocks @InjectMocks
private MdmLinkExpandSvc mySubject; private MdmLinkExpandSvc mySubject;
@BeforeEach
public void beforeEach() {
mySubject.myMdmLinkDao = myIMdmLinkDao;
mySubject.myIdHelperService = myIdHelperService;
}
void beforeEachExpand() { void beforeEachExpand() {
final Answer<Set<String>> answer = invocation -> { final Answer<Set<String>> answer = invocation -> {
final Set<IResourcePersistentId<?>> param = invocation.getArgument(0); final Set<IResourcePersistentId<?>> param = invocation.getArgument(0);

View File

@ -47,6 +47,8 @@ steps:
# 3. Import keys into gpg # 3. Import keys into gpg
- bash: | - bash: |
apt update
apt install -y gpg
gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/public.key gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/public.key
gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/private.key gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/private.key
gpg --list-keys --keyid-format LONG gpg --list-keys --keyid-format LONG