diff --git a/MessageContentAnalyzer-ejb/pom.xml b/MessageContentAnalyzer-ejb/pom.xml
index 1fd3b4ec920e9c40ca42e0d4019dda509ab2fa3d..44f5e6e185d0057d66ad51bb5d951c4900430c92 100644
--- a/MessageContentAnalyzer-ejb/pom.xml
+++ b/MessageContentAnalyzer-ejb/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-evsclient-common</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</dependency>
<!-- Gazelle -->
@@ -231,10 +231,10 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-evsclient-connector</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusiness.java b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusiness.java
index bc10185a4d5a167a183d4ed987a8b5a89efdcb5a..b8f843dc35746162b3262c6e53b64b1139a70890 100644
--- a/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusiness.java
+++ b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusiness.java
@@ -3,7 +3,10 @@ package net.ihe.gazelle.contentanalyzer.app;
import net.ihe.gazelle.common.application.action.ApplicationPreferenceManager;
import net.ihe.gazelle.contentanalyzer.business.McaApi;
import net.ihe.gazelle.contentanalyzer.business.exceptions.UnexpectedAnalysisException;
-import net.ihe.gazelle.contentanalyzer.business.model.*;
+import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObject;
+import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObjectPart;
+import net.ihe.gazelle.contentanalyzer.business.model.ValidationObject;
+import net.ihe.gazelle.contentanalyzer.business.model.ValidationType;
import net.ihe.gazelle.contentanalyzer.business.model.config.McaConfigDAO;
import net.ihe.gazelle.contentanalyzer.business.model.config.MimeTypeConfigEnum;
import net.ihe.gazelle.contentanalyzer.business.model.config.ZipStructureInterface;
@@ -310,30 +313,26 @@ public class AnalyzerBeanBusiness {
init(analyzedObject, toolOid, externalId, proxyType);
}
- public String validate(final String objectPath, final ValidationType validationType, final int startOffset,
+ public ValidationObject createValidationObject(final byte[] content, final ValidationType validationType, final int startOffset,
final int endOffset, final String oid) throws UnexpectedAnalysisException{
- final String encodedObjectPath = this.getEncodedFilePath(objectPath);
+ ValidationObject validationObject = new ValidationObject(oid, startOffset, endOffset, content);
- String url = "/validate.seam?startOffset=" + startOffset + "&endOffset=" + endOffset +
- "&messageContentAnalyzerOid=" + oid + "&filePath=" + encodedObjectPath ;
if(validationType != null){
- url = url + "&validationType=" + validationType.name();
+ validationObject.setValidationType(validationType.name());
}
-
if (getToolOID() != null && !getToolOID().isEmpty()) {
- url += "&toolOid=" + getToolOID();
+ validationObject.setToolOid(getToolOID());
}
// Get the tool externalId if exist (To send back the result)
if (getExternalId() != null && !getExternalId().isEmpty()) {
- url += "&externalId=" + getExternalId();
+ validationObject.setUniqueKey(getExternalId());
}
// Get the proxy type if exist and add it(To send back the result)
if (getProxyType() != null && !getProxyType().isEmpty()) {
- url += "&proxyType=" + getProxyType();
+ validationObject.setType(getProxyType());
}
-
- return url;
+ return validationObject;
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/business/model/ValidationObject.java b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/business/model/ValidationObject.java
new file mode 100644
index 0000000000000000000000000000000000000000..b9d4830f8aef0f587932120196627176b1fbe23f
--- /dev/null
+++ b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/business/model/ValidationObject.java
@@ -0,0 +1,103 @@
+package net.ihe.gazelle.contentanalyzer.business.model;
+
+import net.ihe.gazelle.evsclient.connector.model.MCAValidatedObject;
+import net.ihe.gazelle.evsclient.connector.utils.PartSourceUtils;
+import org.apache.commons.httpclient.methods.multipart.PartSource;
+
+public class ValidationObject implements MCAValidatedObject {
+
+ private String messageContentAnalyserOid;
+
+ private int startOffSet;
+
+ private int endOffSet;
+
+ private String validationType;
+
+ private String toolOid;
+
+ private String uniqueKey;
+
+ private PartSource partSource;
+
+ private String type;
+
+ public ValidationObject(String messageContentAnalyserOid, int startOffSet, int endOffSet, byte[] message) {
+ this.messageContentAnalyserOid = messageContentAnalyserOid;
+ this.startOffSet = startOffSet;
+ this.endOffSet = endOffSet;
+ setPartSource(message);
+ }
+
+ @Override
+ public String getMessageContentAnalyserOid() {
+ return messageContentAnalyserOid;
+ }
+
+ public void setMessageContentAnalyserOid(String messageContentAnalyserOid) {
+ this.messageContentAnalyserOid = messageContentAnalyserOid;
+ }
+
+ @Override
+ public int getStartOffSet() {
+ return startOffSet;
+ }
+
+ public void setStartOffSet(int startOffSet) {
+ this.startOffSet = startOffSet;
+ }
+
+ @Override
+ public int getEndOffSet() {
+ return endOffSet;
+ }
+
+ public void setEndOffSet(int endOffSet) {
+ this.endOffSet = endOffSet;
+ }
+
+ @Override
+ public String getValidationType() {
+ return validationType;
+ }
+
+ public void setValidationType(String validationType) {
+ this.validationType = validationType;
+ }
+
+ @Override
+ public String getToolOid() {
+ return toolOid;
+ }
+
+ public void setToolOid(String toolOid) {
+ this.toolOid = toolOid;
+ }
+
+ @Override
+ public String getUniqueKey() {
+ return uniqueKey;
+ }
+
+ public void setUniqueKey(String uniqueKey) {
+ this.uniqueKey = uniqueKey;
+ }
+
+ @Override
+ public PartSource getPartSource() {
+ return partSource;
+ }
+
+ public void setPartSource(byte[] message) {
+ this.partSource = PartSourceUtils.buildEncoded64PartSource(message, getMessageContentAnalyserOid());
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+}
diff --git a/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBean.java b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBean.java
index 776d4b77f599bf01ede4bbcefd7b799a75b186ef..2d24d152f60710afab5d8ca2fbc71ede2623d9de 100644
--- a/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBean.java
+++ b/MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBean.java
@@ -32,9 +32,9 @@ import net.ihe.gazelle.contentanalyzer.business.McaApi;
import net.ihe.gazelle.contentanalyzer.business.MessageContentAnalyzer;
import net.ihe.gazelle.contentanalyzer.business.analyzers.MimeTypeDetector;
import net.ihe.gazelle.contentanalyzer.business.analyzers.XMLAnalyzer;
-import net.ihe.gazelle.contentanalyzer.business.model.config.McaConfigDAO;
import net.ihe.gazelle.contentanalyzer.business.exceptions.UnexpectedAnalysisException;
import net.ihe.gazelle.contentanalyzer.business.model.*;
+import net.ihe.gazelle.contentanalyzer.business.model.config.McaConfigDAO;
import net.ihe.gazelle.contentanalyzer.business.model.config.MimeTypeConfigEnum;
import net.ihe.gazelle.contentanalyzer.business.model.dao.AnalyzedObjectPartDAO;
import net.ihe.gazelle.evsclient.analyzer.utils.AnalyzerUtils;
@@ -50,14 +50,10 @@ import net.ihe.gazelle.hql.criterion.QueryModifier;
import net.ihe.gazelle.hql.paths.HQLSafePathBasicDate;
import net.ihe.gazelle.hql.restrictions.HQLRestrictions;
import org.apache.commons.io.FileUtils;
-import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.contexts.Context;
-import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.international.StatusMessage.Severity;
import org.richfaces.component.UITree;
@@ -632,25 +628,24 @@ public class AnalyzerBean implements QueryModifier<AnalyzedObject> {
}
public String validate(final String objectPath, final AnalyzedObjectPart node) {
+ String evsClientUrl = ApplicationPreferenceManager.getStringValue("application_url");
try {
if ((node.getDocType().equals("ZIP") || (node.getDocType().equals("DOCUMENT") && !node.getChildList().isEmpty()
&& node.getChildList().get(0).getDocType().equals("ZIP"))) ||
(mcaConfigDao.getZipStructureWithDocType(node.getDocType()) != null || (node.getDocType().equals("DOCUMENT") && !node.getChildList().isEmpty()
&& mcaConfigDao.getZipStructureWithDocType(node.getChildList().get(0).getDocType()) != null))){
FacesMessages.instance().add(Severity.ERROR, "Cannot Validate a ZIP file");
- return "/messageContentAnalyzerDetailedResult.seam?oid=" + this.getAnalyzedObject().getOid();
- }
-
- if (node.getDecodedPartFilePath() != null) {
+ } else if (node.getDecodedPartFilePath() != null) {
if (node.getListOfNamespacesForAnalyzedObjectPart() == null || node .getListOfNamespacesForAnalyzedObjectPart().isEmpty()){
- return analyzerBeanBusiness.validate(node.getDecodedPartFilePath(),
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(node.getDecodedPart(),
node.getValidationType(), node.getStartOffset(), node.getEndOffset(), node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
} else {
- return analyzerBeanBusiness.validate(node.getDecodedPartFilePath(),
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(node.getDecodedPart(),
node.getValidationType(), 0, 0, node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
}
} else if (node.getEncodedType() != null && !node.getEncodedType().equals(EncodedType.NOT_ENCODED)) {
-
AnalyzedObjectPart parent = node.getParent();
if (node.getEncodedType().equals(EncodedType.B64_ENCODED)) {
while (!parent.getDocType().equals(MessageContentAnalyzer.BASE64)) {
@@ -659,27 +654,29 @@ public class AnalyzerBean implements QueryModifier<AnalyzedObject> {
String toDecodeStringContent = getOriginalPartContent(objectPath, parent);
byte[] decodedPartBytesContent = Base64Converter.base64Decoding(toDecodeStringContent.getBytes(StandardCharsets.UTF_8));
if (node.getListOfNamespacesForAnalyzedObjectPart() == null || node.getListOfNamespacesForAnalyzedObjectPart().isEmpty()){
- String decodedPartPath = createDecodedPart(decodedPartBytesContent, objectPath, node);
- return analyzerBeanBusiness.validate(decodedPartPath, node.getValidationType(), node.getStartOffset(),
+ createDecodedPart(decodedPartBytesContent, objectPath, node);
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(decodedPartBytesContent, node.getValidationType(), node.getStartOffset(),
node.getEndOffset(), node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
} else {
String decodedStringContent = new String(decodedPartBytesContent, StandardCharsets.UTF_8);
decodedStringContent = xmlAnalyzer.addNamespacesToFileContent(decodedStringContent
.substring(node.getStartOffset(), node.getEndOffset()),node.getListOfNamespacesForAnalyzedObjectPart());
String decodedPartPath = createAddedNamespacePart(decodedStringContent.getBytes(StandardCharsets.UTF_8), objectPath, node);
- return analyzerBeanBusiness.validate(decodedPartPath, node.getValidationType(), 0,
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(decodedStringContent.getBytes(StandardCharsets.UTF_8), node.getValidationType(), 0,
0, node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
}
} else if (node.getEncodedType().equals(EncodedType.ZIP_ENCODED)) {
if (node.getDocType().contains(MimeTypeDetector.FOLDER_PREFIX)) {
FacesMessages.instance().add(Severity.ERROR, "Cannot validate folders");
- return "/messageContentAnalyzerDetailedResult.seam?oid=" + this.getAnalyzedObject().getOid();
} else if (node.getDocType().contains(MimeTypeDetector.FILE_PREFIX)) {
String decodedStringContent = getOriginalPartContent(objectPath, node);
String decodedPartPath = createDecodedPart(decodedStringContent.getBytes(StandardCharsets.UTF_8),
objectPath, node);
- return analyzerBeanBusiness.validate(decodedPartPath, node.getValidationType(), node.getStartOffset(),
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(decodedStringContent.getBytes(StandardCharsets.UTF_8), node.getValidationType(), node.getStartOffset(),
node.getEndOffset(), node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
} else {
while (!parent.getDocType().contains(MimeTypeDetector.FILE_PREFIX)) {
parent = parent.getParent();
@@ -690,22 +687,25 @@ public class AnalyzerBean implements QueryModifier<AnalyzedObject> {
String decodedPartPath = createDecodedPart(decodedStringContent.getBytes(StandardCharsets.UTF_8),
objectPath, node);
node.setDecodedPartFilePath(decodedPartPath);
- return analyzerBeanBusiness.validate(decodedPartPath, node.getValidationType(), node.getStartOffset(),
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(decodedStringContent.getBytes(StandardCharsets.UTF_8), node.getValidationType(), node.getStartOffset(),
node.getEndOffset(), node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
} else {
decodedStringContent = xmlAnalyzer.addNamespacesToFileContent(decodedStringContent
.substring(node.getStartOffset(), node.getEndOffset()),node.getListOfNamespacesForAnalyzedObjectPart());
String decodedPartPath = createAddedNamespacePart(decodedStringContent.getBytes(StandardCharsets.UTF_8),
objectPath, node);
- return analyzerBeanBusiness.validate(decodedPartPath, node.getValidationType(), 0,
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(decodedStringContent.getBytes(StandardCharsets.UTF_8), node.getValidationType(), 0,
0, node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
}
}
}
} else {
if (node.getListOfNamespacesForAnalyzedObjectPart() == null || node.getListOfNamespacesForAnalyzedObjectPart().isEmpty()){
- return analyzerBeanBusiness.validate(objectPath, node.getValidationType(), node.getStartOffset(),
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(getFileContent().getBytes(StandardCharsets.UTF_8), node.getValidationType(), node.getStartOffset(),
node.getEndOffset(), node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
} else {
String stringFileContent;
try{
@@ -719,15 +719,15 @@ public class AnalyzerBean implements QueryModifier<AnalyzedObject> {
.substring(node.getStartOffset(), node.getEndOffset()),node.getListOfNamespacesForAnalyzedObjectPart());
String addedNamespacesPartPath = createAddedNamespacePart(stringFileContent.getBytes(StandardCharsets.UTF_8),
objectPath, node);
- return analyzerBeanBusiness.validate(addedNamespacesPartPath, node.getValidationType(), 0,
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject(stringFileContent.getBytes(StandardCharsets.UTF_8), node.getValidationType(), 0,
0, node.getMessageContentAnalyzerOid());
+ return EVSClientServletConnector.sendToValidationFromMcaWithoutRedirection(validationObject, evsClientUrl);
}
}
- return analyzerBeanBusiness.validate(objectPath, node.getValidationType(), node.getStartOffset(), node.getEndOffset(), node.getMessageContentAnalyzerOid());
} catch (UnexpectedAnalysisException e) {
logUnexpectedAnalysisException(e);
- return "/messageContentAnalyzerDetailedResult.seam?oid=" + this.getAnalyzedObject().getOid();
}
+ return "/messageContentAnalyzerDetailedResult.seam?oid=" + this.getAnalyzedObject().getOid();
}
public void viewMessagePart(final String objectPath,final AnalyzedObjectPart node) {
diff --git a/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusinessTest.java b/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusinessTest.java
index e9498c08ab566e8daee4d8c551c73c5c4003cd44..622bc6d436db0b0acade75373050fd2dc42f8ad9 100644
--- a/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusinessTest.java
+++ b/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/app/AnalyzerBeanBusinessTest.java
@@ -7,6 +7,7 @@ import net.ihe.gazelle.contentanalyzer.business.analyzers.XMLAnalyzerFactory;
import net.ihe.gazelle.contentanalyzer.business.exceptions.UnexpectedAnalysisException;
import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObject;
import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObjectPart;
+import net.ihe.gazelle.contentanalyzer.business.model.ValidationObject;
import net.ihe.gazelle.contentanalyzer.business.model.ValidationType;
import net.ihe.gazelle.contentanalyzer.business.model.config.McaConfigDaoStub;
import net.ihe.gazelle.contentanalyzer.business.model.dao.AnalyzedObjectDAO;
@@ -268,10 +269,12 @@ public class AnalyzerBeanBusinessTest {
public void validate(){
try{
- String validationLink = analyzerBeanBusiness.validate("objectPath", ValidationType.XML, 0,
- 0, "oid");
- assertEquals("/validate.seam?startOffset=0&endOffset=0&messageContentAnalyzerOid=oid&filePath=b2JqZWN0UGF0aA==&validationType=XML", validationLink);
-
+ ValidationObject validationObject = analyzerBeanBusiness.createValidationObject("objectPath".getBytes(StandardCharsets.UTF_8), ValidationType.XML, 0,
+ 5, "oid");
+ assertEquals(0, validationObject.getStartOffSet());
+ assertEquals(5, validationObject.getEndOffSet());
+ assertEquals("oid", validationObject.getMessageContentAnalyserOid());
+ assertEquals(ValidationType.XML.name(), validationObject.getValidationType());
} catch (UnexpectedAnalysisException e){
fail("No exception is supposed to be raised");
}
diff --git a/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBeanTest.java b/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBeanTest.java
index db346448a56e56101e47c3e25930fce3add6a639..d00820780a2672d59c1f9d61dd246b4bb1e68ca4 100644
--- a/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBeanTest.java
+++ b/MessageContentAnalyzer-ejb/src/test/java/net/ihe/gazelle/contentanalyzer/gui/AnalyzerBeanTest.java
@@ -5,16 +5,13 @@ import net.ihe.gazelle.contentanalyzer.app.AnalyzerBeanBusiness;
import net.ihe.gazelle.contentanalyzer.app.McaPersistenceManager;
import net.ihe.gazelle.contentanalyzer.business.McaApiImpl;
import net.ihe.gazelle.contentanalyzer.business.analyzers.XMLAnalyzerFactory;
-import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObjectPart;
import net.ihe.gazelle.contentanalyzer.business.model.AnalyzedObject;
-import net.ihe.gazelle.contentanalyzer.business.model.EncodedType;
import net.ihe.gazelle.contentanalyzer.business.model.config.McaConfigDaoStub;
import net.ihe.gazelle.evsclient.common.action.ValidationCacheManager;
import net.ihe.gazelle.evsclient.common.model.OIDGenerator;
import net.ihe.gazelle.evsclient.common.model.SharedResult;
import net.ihe.gazelle.hql.providers.EntityManagerService;
import net.ihe.version.ws.Interface.VersionProvider;
-import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,10 +29,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.persistence.EntityManager;
-import java.io.File;
-import java.io.IOException;
-import static net.ihe.gazelle.files.FilesUtils.loadFile;
import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
@@ -197,45 +191,4 @@ public class AnalyzerBeanTest {
assertEquals("DSUB", analyzedObject.getParentAnalyzedObjectPart().getChildList().get(0).getChildList().get(0)
.getChildList().get(0).getChildList().get(0).getDocType());
}
-
- @Test
- public void validateDocumentTest(){
-
- final File f = loadFile("/contentanalyzer/xmlNamespaces.xml");
-
- final AnalyzedObjectPart analyzedObjectPart = new AnalyzedObjectPart(new AnalyzedObjectPart(null));
- analyzedObjectPart.setDocType("DOCUMENT");
- analyzedObjectPart.setEncodedType(EncodedType.NOT_ENCODED);
- analyzedObjectPart.setStartOffset(0);
- analyzedObjectPart.setMessageContentAnalyzerOid("12");
- try {
- analyzedObjectPart.setEndOffset(FileUtils.readFileToString(f).length());
- }catch(IOException e){
- System.out.println(e.getMessage());
- }
-
- assertEquals("/validate.seam?startOffset=0&endOffset=1594&messageContentAnalyzerOid=12&filePath=L2NvbnRlbnRhbmFseXplci94bWxOYW1lc3BhY2VzLnhtbA==",
- analyzerBean.validate("/contentanalyzer/xmlNamespaces.xml", analyzedObjectPart));
- }
-
- @Test
- public void validateWithDecodedPartPathTest(){
-
- final File f = loadFile("/contentanalyzer/xmlNamespaces.xml");
-
- final AnalyzedObjectPart analyzedObjectPart = new AnalyzedObjectPart(new AnalyzedObjectPart(null));
- analyzedObjectPart.setDocType("DOCUMENT");
- analyzedObjectPart.setEncodedType(EncodedType.NOT_ENCODED);
- analyzedObjectPart.setStartOffset(0);
- analyzedObjectPart.setMessageContentAnalyzerOid("12");
- analyzedObjectPart.setDecodedPartFilePath("/contentanalyzer/xmlNamespaces.xml");
- try {
- analyzedObjectPart.setEndOffset(FileUtils.readFileToString(f).length());
- }catch(IOException e){
- System.out.println(e.getMessage());
- }
-
- assertEquals("/validate.seam?startOffset=0&endOffset=1594&messageContentAnalyzerOid=12&filePath=L2NvbnRlbnRhbmFseXplci94bWxOYW1lc3BhY2VzLnhtbA==",
- analyzerBean.validate("/contentanalyzer/xmlNamespaces.xml", analyzedObjectPart));
- }
}
\ No newline at end of file