Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FM-635: fix unit test failure depending on execution order #537

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FM-635: fix unit test failure depending on execution order #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea598f
FM-635: fix global mocked administration service in unit tests
Evaluator9715 Apr 5, 2024
01a8f70
FM2-635: refactor shouldUseDefaultNameTemplateToSetNameText test
Evaluator9715 Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
95 changes: 95 additions & 0 deletions ...ava/org/openmrs/module/fhir2/api/translators/impl/PersonNameTranslatorImplGlobalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public License,
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
*
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
* graphic logo is a trademark of OpenMRS Inc.
*/
package org.openmrs.module.fhir2.api.translators.impl;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;

import java.util.Arrays;
import java.util.Collections;

import org.hl7.fhir.r4.model.HumanName;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.openmrs.PersonName;
import org.openmrs.api.context.ServiceContext;
import org.openmrs.layout.name.NameSupport;
import org.openmrs.layout.name.NameTemplate;
import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
import org.openmrs.serialization.SerializationException;
import org.openmrs.serialization.SimpleXStreamSerializer;
import org.openmrs.test.BaseModuleContextSensitiveTest;
import org.springframework.test.context.ContextConfiguration;

@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
public class PersonNameTranslatorImplGlobalTest extends BaseModuleContextSensitiveTest {

private static final String PERSON_GIVEN_NAME = "Jean Claude";

private static final String PERSON_MIDDLE_NAME = "Wilhelm";

private static final String PERSON_FAMILY_NAME = "van Damme";

private static final String NAME_FORMAT_LAYOUT_PROPERTY_NAME = "layout.name.format";

private PersonNameTranslatorImpl personNameTranslator;

private String originalNameFormatLayoutPropertyValue;

@Before
public void setup() {
personNameTranslator = new PersonNameTranslatorImpl();
originalNameFormatLayoutPropertyValue = ServiceContext.getInstance().getAdministrationService()
.getGlobalProperty(NAME_FORMAT_LAYOUT_PROPERTY_NAME);
ServiceContext.getInstance().getAdministrationService().setGlobalProperty(NAME_FORMAT_LAYOUT_PROPERTY_NAME, "test");
}

@After
public void teardown() {
ServiceContext.getInstance().getAdministrationService().setGlobalProperty(NAME_FORMAT_LAYOUT_PROPERTY_NAME,
originalNameFormatLayoutPropertyValue);
}

@Test
public void shouldUseDefaultNameTemplateToSetNameText() throws SerializationException {
NameSupport nameSupportInstance = new NameSupport();
NameTemplate customNameTemplate = new SimpleXStreamSerializer()
.deserialize("<org.openmrs.layout.name.NameTemplate>\n" + " <codeName>test</codeName>\n"
+ " <displayName>Test Name Format</displayName>\n" + " <nameMappings class=\"properties\">\n"
+ " <property name=\"givenName\" value=\"PersonName.givenName\"/>\n"
+ " <property name=\"middleName\" value=\"PersonName.middleName\"/>\n"
+ " <property name=\"familyName\" value=\"PersonName.familyName\"/>\n" + " </nameMappings>\n"
+ " <sizeMappings class=\"properties\">\n" + " <property name=\"givenName\" value=\"25\"/>\n"
+ " <property name=\"middleName\" value=\"25\"/>\n"
+ " <property name=\"familyName\" value=\"25\"/>\n" + " </sizeMappings>\n"
+ " <lineByLineFormat>\n" + " <string>givenName</string>\n" + " <string>familyName</string>\n"
+ " <string>middleName</string>\n" + " </lineByLineFormat>\n" + " <requiredElements>\n"
+ " <string>givenName</string>\n" + " <string>familyName</string>\n"
+ " </requiredElements>\n" + "</org.openmrs.layout.name.NameTemplate>",
NameTemplate.class);
nameSupportInstance.setLayoutTemplates(Collections.singletonList(customNameTemplate));
nameSupportInstance.setSpecialTokens(Arrays.asList("prefix", "givenName", "middleName", "familyNamePrefix",
"familyNameSuffix", "familyName2", "familyName", "degree"));

PersonName name = new PersonName();
name.setGivenName(PERSON_GIVEN_NAME);
name.setMiddleName(PERSON_MIDDLE_NAME);
name.setFamilyName(PERSON_FAMILY_NAME);

HumanName fhirName = personNameTranslator.toFhirResource(name);

assertThat(fhirName, notNullValue());
assertThat(fhirName.getTextElement(), notNullValue());
assertThat(fhirName.getTextElement().getValue(),
equalTo(PERSON_GIVEN_NAME + " " + PERSON_FAMILY_NAME + " " + PERSON_MIDDLE_NAME));
}
}
49 changes: 0 additions & 49 deletions ...test/java/org/openmrs/module/fhir2/api/translators/impl/PersonNameTranslatorImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,14 @@
import static org.hamcrest.Matchers.hasProperty;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.util.Arrays;
import java.util.Collections;

import org.hl7.fhir.r4.model.Extension;
import org.hl7.fhir.r4.model.HumanName;
import org.hl7.fhir.r4.model.StringType;
import org.junit.Before;
import org.junit.Test;
import org.openmrs.PersonName;
import org.openmrs.api.AdministrationService;
import org.openmrs.api.context.ServiceContext;
import org.openmrs.layout.name.NameSupport;
import org.openmrs.layout.name.NameTemplate;
import org.openmrs.module.fhir2.FhirConstants;
import org.openmrs.serialization.SerializationException;
import org.openmrs.serialization.SimpleXStreamSerializer;

public class PersonNameTranslatorImplTest {

Expand Down Expand Up @@ -163,44 +152,6 @@ public void shouldOnlyCreateOneExtensionForExtensibleAttributes() {
assertThat(extension.getExtension().size(), greaterThan(1));
}

@Test
public void shouldUseDefaultNameTemplateToSetNameText() throws SerializationException {
AdministrationService administrationService = mock(AdministrationService.class);
ServiceContext.getInstance().setAdministrationService(administrationService);
when(administrationService.getGlobalProperty("layout.name.format")).thenReturn("test");

NameSupport nameSupportInstance = new NameSupport();
NameTemplate customNameTemplate = new SimpleXStreamSerializer()
.deserialize("<org.openmrs.layout.name.NameTemplate>\n" + " <codeName>test</codeName>\n"
+ " <displayName>Test Name Format</displayName>\n" + " <nameMappings class=\"properties\">\n"
+ " <property name=\"givenName\" value=\"PersonName.givenName\"/>\n"
+ " <property name=\"middleName\" value=\"PersonName.middleName\"/>\n"
+ " <property name=\"familyName\" value=\"PersonName.familyName\"/>\n" + " </nameMappings>\n"
+ " <sizeMappings class=\"properties\">\n" + " <property name=\"givenName\" value=\"25\"/>\n"
+ " <property name=\"middleName\" value=\"25\"/>\n"
+ " <property name=\"familyName\" value=\"25\"/>\n" + " </sizeMappings>\n"
+ " <lineByLineFormat>\n" + " <string>givenName</string>\n" + " <string>familyName</string>\n"
+ " <string>middleName</string>\n" + " </lineByLineFormat>\n" + " <requiredElements>\n"
+ " <string>givenName</string>\n" + " <string>familyName</string>\n"
+ " </requiredElements>\n" + "</org.openmrs.layout.name.NameTemplate>",
NameTemplate.class);
nameSupportInstance.setLayoutTemplates(Collections.singletonList(customNameTemplate));
nameSupportInstance.setSpecialTokens(Arrays.asList("prefix", "givenName", "middleName", "familyNamePrefix",
"familyNameSuffix", "familyName2", "familyName", "degree"));

PersonName name = new PersonName();
name.setGivenName(PERSON_GIVEN_NAME);
name.setMiddleName(PERSON_MIDDLE_NAME);
name.setFamilyName(PERSON_FAMILY_NAME);

HumanName fhirName = personNameTranslator.toFhirResource(name);

assertThat(fhirName, notNullValue());
assertThat(fhirName.getTextElement(), notNullValue());
assertThat(fhirName.getTextElement().getValue(),
equalTo(PERSON_GIVEN_NAME + " " + PERSON_FAMILY_NAME + " " + PERSON_MIDDLE_NAME));
}

@Test
public void shouldConvertHumanNameToPersonName() {
HumanName name = new HumanName();
Expand Down