0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update test cases

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-09-09 13:06:20 +09:00
parent 5f126b9931
commit 6fc2b9dd69
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java
View file

@ -185,9 +185,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
}
protected void processMetaRobots(final ResponseData responseData, final ResultData resultData, final Document document) {
final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(ConfigName.CONFIG);
final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
String ignore = configMap.get(IGNORE_META_ROBOTS);
if (ignore == null) {
if (fessConfig.isCrawlerIgnoreMetaRobots()) {
@ -233,6 +231,13 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
}
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(config);
return configMap;
}
protected boolean isValidUrl(final String urlStr) {
if (StringUtil.isBlank(urlStr)) {
return false;
@ -464,9 +469,7 @@ public class FessXpathTransformer extends XpathTransformer implements FessTransf
}
protected String getCanonicalUrl(final ResponseData responseData, final Document document) {
final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
final CrawlingConfig crawlingConfig = crawlingConfigHelper.get(responseData.getSessionId());
final Map<String, String> configMap = crawlingConfig.getConfigParameterMap(ConfigName.CONFIG);
final Map<String, String> configMap = getConfigPrameterMap(responseData, ConfigName.CONFIG);
String xpath = configMap.get(HTML_CANONICAL_XPATH);
if (xpath == null) {
xpath = fessConfig.getCrawlerDocumentHtmlCanonicalXpath();

33
src/test/java/org/codelibs/fess/crawler/transformer/FessXpathTransformerTest.java
View file

@ -20,6 +20,7 @@ import java.io.StringWriter;
import java.lang.reflect.Field;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -41,6 +42,7 @@ import org.codelibs.fess.crawler.entity.ResultData;
import org.codelibs.fess.crawler.exception.ChildUrlsException;
import org.codelibs.fess.es.config.exentity.LabelType;
import org.codelibs.fess.es.config.exentity.WebConfig;
import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
import org.codelibs.fess.helper.CrawlingConfigHelper;
import org.codelibs.fess.helper.CrawlingInfoHelper;
import org.codelibs.fess.helper.DocumentHelper;
@ -269,7 +271,12 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
final String data = "<html><body>foo</body></html>";
final Document document = getDocument(data);
final FessXpathTransformer transformer = new FessXpathTransformer();
final FessXpathTransformer transformer = new FessXpathTransformer() {
@Override
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
return Collections.emptyMap();
}
};
final ResponseData responseData = new ResponseData();
responseData.setUrl("http://example.com/");
@ -282,7 +289,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
final String data = "<meta name=\"robots\" content=\"none\" />";
final Document document = getDocument(data);
final FessXpathTransformer transformer = new FessXpathTransformer();
final FessXpathTransformer transformer = new FessXpathTransformer() {
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
return Collections.emptyMap();
}
};
final ResponseData responseData = new ResponseData();
responseData.setUrl("http://example.com/");
@ -301,7 +312,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
final String data = "<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW\" />";
final Document document = getDocument(data);
final FessXpathTransformer transformer = new FessXpathTransformer();
final FessXpathTransformer transformer = new FessXpathTransformer() {
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
return Collections.emptyMap();
}
};
final ResponseData responseData = new ResponseData();
responseData.setUrl("http://example.com/");
@ -340,7 +355,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
final String data = "<meta name=\"robots\" content=\"nofollow\" />";
final Document document = getDocument(data);
final FessXpathTransformer transformer = new FessXpathTransformer();
final FessXpathTransformer transformer = new FessXpathTransformer() {
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
return Collections.emptyMap();
}
};
final ResponseData responseData = new ResponseData();
responseData.setUrl("http://example.com/");
@ -428,7 +447,11 @@ public class FessXpathTransformerTest extends UnitFessTestCase {
}
public void test_canonicalXpath() throws Exception {
final FessXpathTransformer transformer = new FessXpathTransformer();
final FessXpathTransformer transformer = new FessXpathTransformer() {
protected Map<String, String> getConfigPrameterMap(final ResponseData responseData, final ConfigName config) {
return Collections.emptyMap();
}
};
transformer.init();
final Map<String, Object> dataMap = new HashMap<String, Object>();