Commit e84de07a authored by Philippe DAIGREMONT's avatar Philippe DAIGREMONT
Browse files

Merge branch 'feature/WS_ANS_CURRENT' of...

Merge branch 'feature/WS_ANS_CURRENT' of https://gitlab.inria.fr/gazelle/applications/test-execution/validator/EVSClient into feature/WS_ANS_CURRENT

 Conflicts:
	pom.xml
parents 1a948ab8 cb41bb02
Pipeline #317419 failed with stages
in 2 minutes and 44 seconds
......@@ -13,12 +13,12 @@ import java.nio.file.Paths;
import static org.junit.Assert.assertTrue;
@Ignore
public class TestPerfSch {
private static final String SCH_ENDPOINT =
"http://192.168.20.108:8380/SchematronValidator-ejb/SchematronValidatorService/SchematronValidator?wsdl";
@Ignore
@Test
public void testSchematronWSXSD10() throws IOException, SOAPExceptionException {
for (int i = 0; i < 30; i++) {
......
......@@ -101,7 +101,7 @@ public class ValidationsApiServiceImplTest {
fail("Expected MyException.");
// THEN
} catch (ValidationsApiServiceImpl.InvalidApiKeyException expected) {
assertEquals("create-validation.expired-api-key", expected.getMessage());
assertEquals("expired-api-key", expected.getMessage());
} finally {
//PowerMockito.verifyPrivate(validationsApiService, times(1)).invoke("parseApiKey", authorization); // not working
Mockito.verify(apiKeyManager, times(1)).findApiKey(apiKey);
......@@ -151,7 +151,7 @@ public class ValidationsApiServiceImplTest {
fail("Expected MyException.");
// THEN
} catch (ValidationsApiServiceImpl.InvalidAuthorizationException expected) {
assertEquals("create-validation.bad-authorization-format", expected.getMessage());
assertEquals("bad-authorization-format", expected.getMessage());
} finally {
//PowerMockito.verifyPrivate(validationsApiService, times(1)).invoke("parseApiKey", authorization); // not working
Mockito.verify(apiKeyManager, times(0)).findApiKey(apiKey);
......
......@@ -4,6 +4,7 @@ import net.ihe.gazelle.evsclient.interlay.gui.validation.HL7ValidationBeanGui;
import net.ihe.gazelle.evsclient.legacy.hl7.model.HL7ValidatedMessage;
import net.ihe.gazelle.files.FilesUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
......@@ -22,6 +23,7 @@ public class HL7ValidationBeanGuiTest {
*/
}
@Ignore
@Test
public void extractInfoFromER7(){
String messageContent = FilesUtils.loadStringsFromFile("/hl7/message_info.er7");
......@@ -31,6 +33,7 @@ public class HL7ValidationBeanGuiTest {
assertEquals("ADT^A13^ADT_A01", hl7ValidationBeanGui.getMessageTypeFromMessage());
}
@Ignore
@Test
public void extractInfoFromXML(){
String messageContent = FilesUtils.loadStringsFromFile("/hl7/message_info.xml");
......
......@@ -2,6 +2,7 @@ package net.ihe.gazelle.evsclient.legacy.hl7.action;
import net.ihe.gazelle.evsclient.interlay.gui.validation.HL7v2FormatAdapter;
import net.ihe.gazelle.files.FilesUtils;
import org.junit.Ignore;
import org.junit.Test;
import org.richfaces.model.TreeNode;
......
......@@ -5,15 +5,15 @@ import net.ihe.gazelle.evsclient.application.interfaces.adapters.SsoIdentity;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.testng.annotations.TestInstance;
/**
* Test class for {@link StatisticReportDAO}
*/
//@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@RunWith(PowerMockRunner.class)
@PrepareForTest({ApplicationPreferenceManager.class, SsoIdentity.class})
/*@RunWith(PowerMockRunner.class)
@PrepareForTest({ApplicationPreferenceManager.class, SsoIdentity.class})*/
public class StatisticReportDAOTest {
/*private static final Date highDate = new Date();
private static final Date lowDate = new Date(highDate.getTime() - 10);
......
......@@ -75,7 +75,7 @@
<sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gazelle.x.validation.version>1.4.5-SNAPSHOT</gazelle.x.validation.version>
<gazelle.ws.clients.version>2.2.14-SNAPSHOT</gazelle.ws.clients.version>
<gazelle.ws.clients.version>2.3.0-SNAPSHOT</gazelle.ws.clients.version>
<gazelle.validator.unit.testing.version>1.0.7</gazelle.validator.unit.testing.version>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment