honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update azure-pipelines.yml to match projects that have tests (#3993)

This commit is contained in:
Ken Stevens 2022-09-06 14:05:15 -04:00 committed by GitHub
parent f3e6837fce
commit ec5a6adca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
azure-pipelines.yml
View File

@ -32,34 +32,28 @@ stages:
module: hapi-fhir-structures-r4
- name: hapi_fhir_jpaserver_base
module: hapi-fhir-jpaserver-base
- name: hapi_deployable_pom
module: hapi-deployable-pom
- name: hapi_fhir_android
module: hapi-fhir-android
- name: hapi_fhir_base
module: hapi-fhir-base
- name: hapi_fhir_batch
module: hapi-fhir-batch
- name: hapi_fhir_bom
module: hapi-fhir-bom
- name: hapi_fhir_checkstyle
module: hapi-fhir-checkstyle
- name: hapi_fhir_cli
module: hapi-fhir-cli
- name: hapi_fhir_cli_api
module: hapi-fhir-cli/hapi-fhir-cli-api
- name: hapi_fhir_cli_jpaserver
module: hapi-fhir-cli/hapi-fhir-cli-jpaserver
- name: hapi_fhir_client
module: hapi-fhir-client
- name: hapi_fhir_client_okhttp
module: hapi-fhir-client-okhttp
- name: hapi_fhir_converter
module: hapi-fhir-converter
- name: hapi_fhir_dist
module: hapi-fhir-dist
- name: hapi_fhir_docs
module: hapi-fhir-docs
- name: hapi_fhir_jaxrsserver_base
module: hapi-fhir-jaxrsserver-base
- name: hapi_fhir_jpa
module: hapi-fhir-jpa
# Put to top, but kept in order here
# - name: hapi_fhir_jpaserver_base
# module: hapi-fhir-jpaserver-base
@ -86,8 +80,10 @@ stages:
module: hapi-fhir-server-mdm
- name: hapi_fhir_server_openapi
module: hapi-fhir-server-openapi
- name: hapi_fhir_spring_boot
module: hapi-fhir-spring-boot
- name: hapi_fhir_spring_boot_autoconfigure
module: hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure
- name: hapi_fhir_spring_boot_sample_server_jersey
module: hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey
- name: hapi_fhir_sql_migrate
module: hapi-fhir-sql-migrate
- name: hapi_fhir_storage
@ -119,16 +115,10 @@ stages:
module: hapi-fhir-testpage-overlay
- name: hapi_fhir_validation
module: hapi-fhir-validation
- name: hapi_fhir_validation_resources_dstu2
module: hapi-fhir-validation-resources-dstu2
- name: hapi_fhir_validation_resources_dstu2_1
module: hapi-fhir-validation-resources-dstu2.1
- name: hapi_fhir_validation_resources_dstu3
module: hapi-fhir-validation-resources-dstu3
- name: hapi_fhir_validation_resources_r4
module: hapi-fhir-validation-resources-r4
- name: hapi_fhir_validation_resources_r5
module: hapi-fhir-validation-resources-r5
- name: hapi_tinder_plugin
module: hapi-tinder-plugin
- name: hapi_tinder_test

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/StopWatch.java
View File

@ -43,6 +43,8 @@ import java.util.concurrent.TimeUnit;
*/
public class StopWatch {
// TODO KHS it is risky for this to be a static field. Safer to make it non-static, but that will require
// TODO KHS significant rework of StopWatchTest
private static Long ourNowForUnitTest;
private long myStarted = now();
private TaskTiming myCurrentTask;

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TimeoutManager.java
View File

@ -1,6 +1,7 @@
package ca.uhn.fhir.util;
import ca.uhn.fhir.i18n.Msg;
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -46,7 +47,8 @@ public class TimeoutManager {
return retval;
}
public void addTimeForUnitTest(Duration theDuration) {
@VisibleForTesting
void addTimeForUnitTest(Duration theDuration) {
myStopWatch.setNowForUnitTest(myStopWatch.getStartedDate().getTime() + theDuration.toMillis());
}
}

6
hapi-fhir-base/src/test/java/ca/uhn/fhir/util/TimeoutManagerTest.java
View File

@ -3,6 +3,7 @@ package ca.uhn.fhir.util;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -36,6 +37,11 @@ class TimeoutManagerTest {
TimeoutManager mySvc = new TimeoutManager(TEST_SERVICE_NAME, myWarningTimeout, myErrorTimeout);
@AfterAll
public static void resetStopwatch() {
StopWatch.setNowForUnitTest(null);
}
@BeforeEach
void before() {
ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(TimeoutManager.class);