You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/10/13 18:11:21 UTC
svn commit: r1022165 [2/2] - in
/lucene/dev/trunk/solr/contrib/dataimporthandler/src:
extras/test/java/org/apache/solr/handler/dataimport/
test/java/org/apache/solr/handler/dataimport/
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestNumberFormatTransformer.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.text.DecimalFormatSymbols;
@@ -34,7 +32,7 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestNumberFormatTransformer extends SolrTestCaseJ4 {
+public class TestNumberFormatTransformer extends AbstractDataImportHandlerTestCase {
private char GROUPING_SEP = new DecimalFormatSymbols().getGroupingSeparator();
private char DECIMAL_SEP = new DecimalFormatSymbols().getDecimalSeparator();
@@ -43,55 +41,53 @@ public class TestNumberFormatTransformer
public void testTransformRow_SingleNumber() {
char GERMAN_GROUPING_SEP = new DecimalFormatSymbols(Locale.GERMANY).getGroupingSeparator();
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "localizedNum",
+ l.add(createMap("column", "localizedNum",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER, NumberFormatTransformer.LOCALE, "de-DE"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap("num", "123" + GROUPING_SEP + "567", "localizedNum", "123" + GERMAN_GROUPING_SEP + "567");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + "567", "localizedNum", "123" + GERMAN_GROUPING_SEP + "567");
new NumberFormatTransformer().transformRow(m, c);
- Assert.assertEquals(new Long(123567), m.get("num"));
- Assert.assertEquals(new Long(123567), m.get("localizedNum"));
+ assertEquals(new Long(123567), m.get("num"));
+ assertEquals(new Long(123567), m.get("localizedNum"));
}
@Test
@SuppressWarnings("unchecked")
public void testTransformRow_MultipleNumbers() throws Exception {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
- "inputs"));
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
+ fields.add(createMap(DataImporter.COLUMN, "inputs"));
+ fields.add(createMap(DataImporter.COLUMN,
"outputs", RegexTransformer.SRC_COL_NAME, "inputs",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
List inputs = new ArrayList();
inputs.add("123" + GROUPING_SEP + "567");
inputs.add("245" + GROUPING_SEP + "678");
- Map row = AbstractDataImportHandlerTestCase.createMap("inputs", inputs);
+ Map row = createMap("inputs", inputs);
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver, null, Context.FULL_DUMP, fields, null);
+ Context context = getContext(null, resolver, null, Context.FULL_DUMP, fields, null);
new NumberFormatTransformer().transformRow(row, context);
List output = new ArrayList();
output.add(new Long(123567));
output.add(new Long(245678));
- Map outputRow = AbstractDataImportHandlerTestCase.createMap("inputs", inputs,
- "outputs", output);
+ Map outputRow = createMap("inputs", inputs, "outputs", output);
- Assert.assertEquals(outputRow, row);
+ assertEquals(outputRow, row);
}
@Test(expected = DataImportHandlerException.class)
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput1_Number() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap("num", "123" + GROUPING_SEP + "5a67");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + "5a67");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -99,10 +95,10 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput2_Number() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap("num", "123" + GROUPING_SEP + "567b");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + "567b");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -110,10 +106,10 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput2_Currency() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.CURRENCY));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap("num", "123" + GROUPING_SEP + "567b");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + "567b");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -121,10 +117,10 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput1_Percent() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.PERCENT));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap("num", "123" + GROUPING_SEP + "5a67");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + "5a67");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -132,11 +128,10 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput3_Currency() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.CURRENCY));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap(
- "num", "123" + DECIMAL_SEP + "456" + DECIMAL_SEP + "789");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + DECIMAL_SEP + "456" + DECIMAL_SEP + "789");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -144,11 +139,10 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_InvalidInput3_Number() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap(
- "num", "123" + DECIMAL_SEP + "456" + DECIMAL_SEP + "789");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + DECIMAL_SEP + "456" + DECIMAL_SEP + "789");
new NumberFormatTransformer().transformRow(m, c);
}
@@ -156,12 +150,11 @@ public class TestNumberFormatTransformer
@SuppressWarnings("unchecked")
public void testTransformRow_MalformedInput_Number() {
List l = new ArrayList();
- l.add(AbstractDataImportHandlerTestCase.createMap("column", "num",
+ l.add(createMap("column", "num",
NumberFormatTransformer.FORMAT_STYLE, NumberFormatTransformer.NUMBER));
- Context c = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, l, null);
- Map m = AbstractDataImportHandlerTestCase.createMap(
- "num", "123" + GROUPING_SEP + GROUPING_SEP + "789");
+ Context c = getContext(null, null, null, Context.FULL_DUMP, l, null);
+ Map m = createMap("num", "123" + GROUPING_SEP + GROUPING_SEP + "789");
new NumberFormatTransformer().transformRow(m, c);
- Assert.assertEquals(new Long(123789), m.get("num"));
+ assertEquals(new Long(123789), m.get("num"));
}
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java Wed Oct 13 16:11:07 2010
@@ -16,10 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.Assert;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.createMap;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.junit.Test;
import java.io.StringReader;
@@ -32,16 +28,15 @@ import java.util.Properties;
* @see org.apache.solr.handler.dataimport.PlainTextEntityProcessor
* @since solr 1.4
*/
-public class TestPlainTextEntityProcessor extends SolrTestCaseJ4 {
+public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestCase {
@Test
- public void simple() {
+ public void testSimple() {
DataImporter di = new DataImporter();
di.loadAndInit(DATA_CONFIG);
TestDocBuilder.SolrWriterImpl sw = new TestDocBuilder.SolrWriterImpl();
DataImporter.RequestParams rp = new DataImporter.RequestParams(createMap("command", "full-import"));
di.runCmd(rp, sw);
- Assert.assertEquals(DS.s, sw.docs.get(0).getFieldValue("x"));
-
+ assertEquals(DS.s, sw.docs.get(0).getFieldValue("x"));
}
public static class DS extends DataSource {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestRegexTransformer.java Wed Oct 13 16:11:07 2010
@@ -20,11 +20,7 @@ import static org.apache.solr.handler.da
import static org.apache.solr.handler.dataimport.RegexTransformer.GROUP_NAMES;
import static org.apache.solr.handler.dataimport.RegexTransformer.REPLACE_WITH;
import static org.apache.solr.handler.dataimport.DataImporter.COLUMN;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.createMap;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.getContext;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
@@ -38,26 +34,26 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestRegexTransformer extends SolrTestCaseJ4 {
+public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
@Test
- public void commaSeparated() {
+ public void testCommaSeparated() {
List<Map<String, String>> fields = new ArrayList<Map<String, String>>();
// <field column="col1" sourceColName="a" splitBy="," />
fields.add(getField("col1", "string", null, "a", ","));
- Context context = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, fields, null);
+ Context context = getContext(null, null, null, Context.FULL_DUMP, fields, null);
Map<String, Object> src = new HashMap<String, Object>();
src.put("a", "a,bb,cc,d");
Map<String, Object> result = new RegexTransformer().transformRow(src, context);
- Assert.assertEquals(2, result.size());
- Assert.assertEquals(4, ((List) result.get("col1")).size());
+ assertEquals(2, result.size());
+ assertEquals(4, ((List) result.get("col1")).size());
}
@Test
- public void groupNames() {
+ public void testGroupNames() {
List<Map<String, String>> fields = new ArrayList<Map<String, String>>();
// <field column="col1" regex="(\w*)(\w*) (\w*)" groupNames=",firstName,lastName"/>
Map<String ,String > m = new HashMap<String, String>();
@@ -65,13 +61,13 @@ public class TestRegexTransformer extend
m.put(GROUP_NAMES,",firstName,lastName");
m.put(REGEX,"(\\w*) (\\w*) (\\w*)");
fields.add(m);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, null, null, Context.FULL_DUMP, fields, null);
+ Context context = getContext(null, null, null, Context.FULL_DUMP, fields, null);
Map<String, Object> src = new HashMap<String, Object>();
src.put("fullName", "Mr Noble Paul");
Map<String, Object> result = new RegexTransformer().transformRow(src, context);
- Assert.assertEquals("Noble", result.get("firstName"));
- Assert.assertEquals("Paul", result.get("lastName"));
+ assertEquals("Noble", result.get("firstName"));
+ assertEquals("Paul", result.get("lastName"));
src= new HashMap<String, Object>();
List<String> l= new ArrayList();
l.add("Mr Noble Paul") ;
@@ -80,21 +76,20 @@ public class TestRegexTransformer extend
result = new RegexTransformer().transformRow(src, context);
List l1 = (List) result.get("firstName");
List l2 = (List) result.get("lastName");
- Assert.assertEquals("Noble", l1.get(0));
- Assert.assertEquals("Shalin", l1.get(1));
- Assert.assertEquals("Paul", l2.get(0));
- Assert.assertEquals("Mangar", l2.get(1));
+ assertEquals("Noble", l1.get(0));
+ assertEquals("Shalin", l1.get(1));
+ assertEquals("Paul", l2.get(0));
+ assertEquals("Mangar", l2.get(1));
}
@Test
- public void replaceWith() {
+ public void testReplaceWith() {
List<Map<String, String>> fields = new ArrayList<Map<String, String>>();
// <field column="name" regexp="'" replaceWith="''" />
Map<String, String> fld = getField("name", "string", "'", null, null);
fld.put(REPLACE_WITH, "''");
fields.add(fld);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, null,
- null, Context.FULL_DUMP, fields, null);
+ Context context = getContext(null, null, null, Context.FULL_DUMP, fields, null);
Map<String, Object> src = new HashMap<String, Object>();
String s = "D'souza";
@@ -102,11 +97,11 @@ public class TestRegexTransformer extend
Map<String, Object> result = new RegexTransformer().transformRow(src,
context);
- Assert.assertEquals("D''souza", result.get("name"));
+ assertEquals("D''souza", result.get("name"));
}
@Test
- public void mileage() {
+ public void testMileage() {
// init a whole pile of fields
List<Map<String, String>> fields = getFields();
@@ -141,16 +136,16 @@ public class TestRegexTransformer extend
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Map<String, String> eAttrs = AbstractDataImportHandlerTestCase.createMap("name", "e");
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver, null, Context.FULL_DUMP, fields, eAttrs);
+ Map<String, String> eAttrs = createMap("name", "e");
+ Context context = getContext(null, resolver, null, Context.FULL_DUMP, fields, eAttrs);
Map<String, Object> result = new RegexTransformer().transformRow(row, context);
- Assert.assertEquals(5, result.size());
- Assert.assertEquals(s, result.get("rowdata"));
- Assert.assertEquals("26", result.get("highway_mileage"));
- Assert.assertEquals("19", result.get("city_mileage"));
- Assert.assertEquals("*** 19 *** mpg City", result.get("hltCityMPG"));
- Assert.assertEquals("Fuel Economy range: 26 mpg Hwy, 19 mpg City", result.get("t3"));
+ assertEquals(5, result.size());
+ assertEquals(s, result.get("rowdata"));
+ assertEquals("26", result.get("highway_mileage"));
+ assertEquals("19", result.get("city_mileage"));
+ assertEquals("*** 19 *** mpg City", result.get("hltCityMPG"));
+ assertEquals("Fuel Economy range: 26 mpg Hwy, 19 mpg City", result.get("t3"));
}
@Test
@@ -166,9 +161,7 @@ public class TestRegexTransformer extend
strings.add("hello");
strings.add("world");
Map<String, Object> result = new RegexTransformer().transformRow(createMap("person", strings), context);
- Assert.assertEquals(strings,result.get("participant"));
-
-
+ assertEquals(strings,result.get("participant"));
}
public static List<Map<String, String>> getFields() {
@@ -197,15 +190,4 @@ public class TestRegexTransformer extend
fields.add(getField("rowdata", "string", null, "rowdata", null));
return fields;
}
-
- public static Map<String, String> getField(String col, String type,
- String re, String srcCol, String splitBy) {
- HashMap<String, String> vals = new HashMap<String, String>();
- vals.put("column", col);
- vals.put("type", type);
- vals.put("regex", re);
- vals.put("sourceColName", srcCol);
- vals.put("splitBy", splitBy);
- return vals;
- }
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestScriptTransformer.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -43,11 +41,11 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestScriptTransformer extends SolrTestCaseJ4 {
+public class TestScriptTransformer extends AbstractDataImportHandlerTestCase {
@Test
@Ignore
- public void basic() {
+ public void testBasic() {
String script = "function f1(row,context){"
+ "row.put('name','Hello ' + row.get('name'));" + "return row;\n" + "}";
Context context = getContext("f1", script);
@@ -56,8 +54,7 @@ public class TestScriptTransformer exten
EntityProcessorWrapper sep = new EntityProcessorWrapper(new SqlEntityProcessor(), null);
sep.init(context);
sep.applyTransformer(map);
- Assert.assertEquals(map.get("name"), "Hello Scott");
-
+ assertEquals(map.get("name"), "Hello Scott");
}
private Context getContext(String funcName, String script) {
@@ -66,7 +63,7 @@ public class TestScriptTransformer exten
entity.put("name", "hello");
entity.put("transformer", "script:" + funcName);
- AbstractDataImportHandlerTestCase.TestContext context = AbstractDataImportHandlerTestCase.getContext(null, null, null,
+ TestContext context = getContext(null, null, null,
Context.FULL_DUMP, fields, entity);
context.script = script;
context.scriptlang = "JavaScript";
@@ -75,7 +72,7 @@ public class TestScriptTransformer exten
@Test
@Ignore
- public void oneparam() {
+ public void testOneparam() {
String script = "function f1(row){"
+ "row.put('name','Hello ' + row.get('name'));" + "return row;\n" + "}";
@@ -86,25 +83,24 @@ public class TestScriptTransformer exten
EntityProcessorWrapper sep = new EntityProcessorWrapper(new SqlEntityProcessor(), null);
sep.init(context);
sep.applyTransformer(map);
- Assert.assertEquals(map.get("name"), "Hello Scott");
-
+ assertEquals(map.get("name"), "Hello Scott");
}
@Test
@Ignore
- public void readScriptTag() throws Exception {
+ public void testReadScriptTag() throws Exception {
DocumentBuilder builder = DocumentBuilderFactory.newInstance()
.newDocumentBuilder();
Document document = builder.parse(new InputSource(new StringReader(xml)));
DataConfig config = new DataConfig();
config.readFromXml((Element) document.getElementsByTagName("dataConfig")
.item(0));
- Assert.assertTrue(config.script.text.indexOf("checkNextToken") > -1);
+ assertTrue(config.script.text.indexOf("checkNextToken") > -1);
}
@Test
@Ignore
- public void checkScript() throws Exception {
+ public void testCheckScript() throws Exception {
DocumentBuilder builder = DocumentBuilderFactory.newInstance()
.newDocumentBuilder();
Document document = builder.parse(new InputSource(new StringReader(xml)));
@@ -119,12 +115,11 @@ public class TestScriptTransformer exten
EntityProcessorWrapper sep = new EntityProcessorWrapper(new SqlEntityProcessor(), null);
sep.init(c);
sep.applyTransformer(map);
- Assert.assertEquals("true", map.get("$hasMore"));
+ assertEquals("true", map.get("$hasMore"));
map = new HashMap();
map.put("nextToken", "");
sep.applyTransformer(map);
- Assert.assertNull(map.get("$hasMore"));
-
+ assertNull(map.get("$hasMore"));
}
static String xml = "<dataConfig>\n"
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.util.*;
@@ -30,18 +28,17 @@ import java.util.*;
* @version $Id$
* @since solr 1.3
*/
-public class TestSqlEntityProcessor extends SolrTestCaseJ4 {
+public class TestSqlEntityProcessor extends AbstractDataImportHandlerTestCase {
private static ThreadLocal<Integer> local = new ThreadLocal<Integer>();
@Test
- public void singleBatch() {
+ public void testSingleBatch() {
SqlEntityProcessor sep = new SqlEntityProcessor();
List<Map<String, Object>> rows = getRows(3);
VariableResolverImpl vr = new VariableResolverImpl();
HashMap<String, String> ea = new HashMap<String, String>();
ea.put("query", "SELECT * FROM A");
- Context c = AbstractDataImportHandlerTestCase.getContext(null, vr, getDs(rows),
- Context.FULL_DUMP, null, ea);
+ Context c = getContext(null, vr, getDs(rows), Context.FULL_DUMP, null, ea);
sep.init(c);
int count = 0;
while (true) {
@@ -51,11 +48,11 @@ public class TestSqlEntityProcessor exte
count++;
}
- Assert.assertEquals(3, count);
+ assertEquals(3, count);
}
@Test
- public void tranformer() {
+ public void testTranformer() {
EntityProcessor sep = new EntityProcessorWrapper( new SqlEntityProcessor(), null);
List<Map<String, Object>> rows = getRows(2);
VariableResolverImpl vr = new VariableResolverImpl();
@@ -63,8 +60,7 @@ public class TestSqlEntityProcessor exte
ea.put("query", "SELECT * FROM A");
ea.put("transformer", T.class.getName());
- sep.init(AbstractDataImportHandlerTestCase.getContext(null, vr, getDs(rows),
- Context.FULL_DUMP, null, ea));
+ sep.init(getContext(null, vr, getDs(rows), Context.FULL_DUMP, null, ea));
List<Map<String, Object>> rs = new ArrayList<Map<String, Object>>();
Map<String, Object> r = null;
while (true) {
@@ -74,12 +70,12 @@ public class TestSqlEntityProcessor exte
rs.add(r);
}
- Assert.assertEquals(2, rs.size());
- Assert.assertNotNull(rs.get(0).get("T"));
+ assertEquals(2, rs.size());
+ assertNotNull(rs.get(0).get("T"));
}
@Test
- public void tranformerWithReflection() {
+ public void testTranformerWithReflection() {
EntityProcessor sep = new EntityProcessorWrapper(new SqlEntityProcessor(), null);
List<Map<String, Object>> rows = getRows(2);
VariableResolverImpl vr = new VariableResolverImpl();
@@ -87,8 +83,7 @@ public class TestSqlEntityProcessor exte
ea.put("query", "SELECT * FROM A");
ea.put("transformer", T3.class.getName());
- sep.init(AbstractDataImportHandlerTestCase.getContext(null, vr, getDs(rows),
- Context.FULL_DUMP, null, ea));
+ sep.init(getContext(null, vr, getDs(rows), Context.FULL_DUMP, null, ea));
List<Map<String, Object>> rs = new ArrayList<Map<String, Object>>();
Map<String, Object> r = null;
while (true) {
@@ -98,12 +93,12 @@ public class TestSqlEntityProcessor exte
rs.add(r);
}
- Assert.assertEquals(2, rs.size());
- Assert.assertNotNull(rs.get(0).get("T3"));
+ assertEquals(2, rs.size());
+ assertNotNull(rs.get(0).get("T3"));
}
@Test
- public void tranformerList() {
+ public void testTranformerList() {
EntityProcessor sep = new EntityProcessorWrapper(new SqlEntityProcessor(),null);
List<Map<String, Object>> rows = getRows(2);
VariableResolverImpl vr = new VariableResolverImpl();
@@ -111,8 +106,7 @@ public class TestSqlEntityProcessor exte
HashMap<String, String> ea = new HashMap<String, String>();
ea.put("query", "SELECT * FROM A");
ea.put("transformer", T2.class.getName());
- sep.init(AbstractDataImportHandlerTestCase.getContext(null, vr, getDs(rows),
- Context.FULL_DUMP, null, ea));
+ sep.init(getContext(null, vr, getDs(rows), Context.FULL_DUMP, null, ea));
local.set(0);
Map<String, Object> r = null;
@@ -123,8 +117,8 @@ public class TestSqlEntityProcessor exte
break;
count++;
}
- Assert.assertEquals(2, (int) local.get());
- Assert.assertEquals(4, count);
+ assertEquals(2, (int) local.get());
+ assertEquals(4, count);
}
private List<Map<String, Object>> getRows(int count) {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java Wed Oct 13 16:11:07 2010
@@ -16,6 +16,8 @@
*/
package org.apache.solr.handler.dataimport;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
@@ -33,26 +35,18 @@ import java.text.ParseException;
* @since solr 1.3
*/
public class TestSqlEntityProcessor2 extends AbstractDataImportHandlerTestCase {
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
}
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
-
- @Override
+ @Before @Override
public void setUp() throws Exception {
super.setUp();
+ clearIndex();
+ assertU(commit());
}
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
+
@Test
@SuppressWarnings("unchecked")
public void testCompositePk_FullImport() throws Exception {
@@ -66,11 +60,12 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from y where y.A=1", childRow
.iterator());
- super.runFullImport(dataConfig);
+ runFullImport(dataConfig);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("desc:hello"), "//*[@numFound='1']");
}
+
@Test
@SuppressWarnings("unchecked")
public void testCompositePk_FullImport_MT() throws Exception {
@@ -85,7 +80,7 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from y where y.A=1", childRow.iterator());
MockDataSource.setIterator("select * from y where y.A=2", childRow.iterator());
- super.runFullImport(dataConfig_2threads);
+ runFullImport(dataConfig_2threads);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='1']");
@@ -106,7 +101,7 @@ public class TestSqlEntityProcessor2 ext
.iterator());
- super.runFullImport(dataConfig,createMap("commit","false"));
+ runFullImport(dataConfig,createMap("commit","false"));
assertQ(req("id:10"), "//*[@numFound='0']");
}
@@ -128,7 +123,7 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from y where y.A=5", childRow
.iterator());
- super.runDeltaImport(dataConfig);
+ runDeltaImport(dataConfig);
assertQ(req("id:5"), "//*[@numFound='1']");
assertQ(req("desc:hello"), "//*[@numFound='1']");
@@ -147,7 +142,7 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from y where y.A=11", childRow
.iterator());
- super.runFullImport(dataConfig);
+ runFullImport(dataConfig);
assertQ(req("id:11"), "//*[@numFound='1']");
@@ -175,13 +170,11 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from x where id = '17'", parentRow
.iterator());
- super.runDeltaImport(dataConfig);
+ runDeltaImport(dataConfig);
assertQ(req("id:15"), "//*[@numFound='1']");
assertQ(req("id:11"), "//*[@numFound='0']");
assertQ(req("id:17"), "//*[@numFound='0']");
-
-
}
@Test
@@ -202,7 +195,7 @@ public class TestSqlEntityProcessor2 ext
MockDataSource.setIterator("select * from y where y.A=5", childRow
.iterator());
- super.runDeltaImport(dataConfig_deltaimportquery);
+ runDeltaImport(dataConfig_deltaimportquery);
assertQ(req("id:5"), "//*[@numFound='1']");
assertQ(req("desc:hello"), "//*[@numFound='1']");
@@ -214,7 +207,7 @@ public class TestSqlEntityProcessor2 ext
List row = new ArrayList();
row.add(createMap("id", 5));
MockDataSource.setIterator("select * from x where last_modified > OK", row.iterator());
- super.runFullImport(dataConfig_LastIndexTime);
+ runFullImport(dataConfig_LastIndexTime);
assertQ(req("id:5"), "//*[@numFound='1']");
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java Wed Oct 13 16:11:07 2010
@@ -16,10 +16,11 @@
*/
package org.apache.solr.handler.dataimport;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -39,27 +40,18 @@ public class TestSqlEntityProcessorDelta
private static final String DELETED_PK_QUERY = "select id from x where last_modified > NOW AND deleted='true'";
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
}
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
-
- @Override
+ @Before @Override
public void setUp() throws Exception {
super.setUp();
+ clearIndex();
+ assertU(commit());
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
-
@SuppressWarnings("unchecked")
private void add1document() throws Exception {
List parentRow = new ArrayList();
@@ -71,7 +63,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runFullImport(dataConfig_delta);
+ runFullImport(dataConfig_delta);
assertQ(req("*:* OR add1document"), "//*[@numFound='1']");
assertQ(req("id:1"), "//*[@numFound='1']");
@@ -102,7 +94,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR testCompositePk_DeltaImport_delete"), "//*[@numFound='0']");
}
@@ -126,7 +118,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR testCompositePk_DeltaImport_empty"), "//*[@numFound='1']");
assertQ(req("id:1"), "//*[@numFound='1']");
@@ -137,7 +129,7 @@ public class TestSqlEntityProcessorDelta
@Test
@SuppressWarnings("unchecked")
- public void XtestCompositePk_DeltaImport_replace_delete() throws Exception {
+ public void testCompositePk_DeltaImport_replace_delete() throws Exception {
add1document();
MockDataSource.clearCache();
@@ -161,7 +153,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR testCompositePk_DeltaImport_replace_delete"), "//*[@numFound='0']");
}
@@ -191,7 +183,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR XtestCompositePk_DeltaImport_replace_nodelete"), "//*[@numFound='1']");
assertQ(req("id:1"), "//*[@numFound='1']");
@@ -220,7 +212,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='2'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR testCompositePk_DeltaImport_add"), "//*[@numFound='2']");
assertQ(req("id:1"), "//*[@numFound='1']");
@@ -238,7 +230,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator(DELTA_QUERY,
Collections.EMPTY_LIST.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR testCompositePk_DeltaImport_nodelta"), "//*[@numFound='1']");
assertQ(req("id:1 OR testCompositePk_DeltaImport_nodelta"), "//*[@numFound='1']");
@@ -271,7 +263,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='2'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta);
+ runDeltaImport(dataConfig_delta);
assertQ(req("*:* OR XtestCompositePk_DeltaImport_add_delete"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='1']");
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta2.java Wed Oct 13 16:11:07 2010
@@ -16,10 +16,11 @@
*/
package org.apache.solr.handler.dataimport;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -39,27 +40,18 @@ public class TestSqlEntityProcessorDelta
private static final String DELETED_PK_QUERY = "select id from x where last_modified > NOW AND deleted='true'";
- @Override
- public String getSchemaFile() {
- return "dataimport-solr_id-schema.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-solr_id-schema.xml");
}
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
-
- @Override
+
+ @Before @Override
public void setUp() throws Exception {
super.setUp();
+ clearIndex();
+ assertU(commit());
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
-
@SuppressWarnings("unchecked")
private void add1document() throws Exception {
List parentRow = new ArrayList();
@@ -71,7 +63,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runFullImport(dataConfig_delta2);
+ runFullImport(dataConfig_delta2);
assertQ(req("*:* OR add1document"), "//*[@numFound='1']");
assertQ(req("solr_id:prefix-1"), "//*[@numFound='1']");
@@ -100,7 +92,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR testCompositePk_DeltaImport_delete"), "//*[@numFound='0']");
}
@@ -124,7 +116,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR testCompositePk_DeltaImport_empty"), "//*[@numFound='1']");
assertQ(req("solr_id:prefix-1"), "//*[@numFound='1']");
@@ -133,7 +125,7 @@ public class TestSqlEntityProcessorDelta
@Test
@SuppressWarnings("unchecked")
- public void XtestCompositePk_DeltaImport_replace_delete() throws Exception {
+ public void testCompositePk_DeltaImport_replace_delete() throws Exception {
add1document();
MockDataSource.clearCache();
@@ -157,7 +149,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR testCompositePk_DeltaImport_replace_delete"), "//*[@numFound='0']");
}
@@ -187,7 +179,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='1'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR XtestCompositePk_DeltaImport_replace_nodelete"), "//*[@numFound='1']");
assertQ(req("solr_id:prefix-1"), "//*[@numFound='1']");
@@ -216,7 +208,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='2'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR testCompositePk_DeltaImport_add"), "//*[@numFound='2']");
assertQ(req("solr_id:prefix-1"), "//*[@numFound='1']");
@@ -234,7 +226,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator(DELTA_QUERY,
Collections.EMPTY_LIST.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR testCompositePk_DeltaImport_nodelta"), "//*[@numFound='1']");
assertQ(req("solr_id:prefix-1 OR testCompositePk_DeltaImport_nodelta"), "//*[@numFound='1']");
@@ -267,7 +259,7 @@ public class TestSqlEntityProcessorDelta
MockDataSource.setIterator("select * from y where y.A='2'", childRow
.iterator());
- super.runDeltaImport(dataConfig_delta2);
+ runDeltaImport(dataConfig_delta2);
assertQ(req("*:* OR XtestCompositePk_DeltaImport_add_delete"), "//*[@numFound='1']");
assertQ(req("solr_id:prefix-2"), "//*[@numFound='1']");
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateString.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.util.HashMap;
@@ -33,20 +31,17 @@ import java.util.regex.Pattern;
* @version $Id$
* @since solr 1.3
*/
-public class TestTemplateString extends SolrTestCaseJ4 {
+public class TestTemplateString extends AbstractDataImportHandlerTestCase {
@Test
public void testSimple() {
VariableResolverImpl vri = new VariableResolverImpl();
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("last_index_time", Long.valueOf(1199429363730l));
vri.addNamespace("indexer", ns);
- Assert
- .assertEquals(
- "select id from subject where last_modified > 1199429363730",
- new TemplateString()
- .replaceTokens(
- "select id from subject where last_modified > ${indexer.last_index_time}",
- vri));
+ assertEquals("select id from subject where last_modified > 1199429363730",
+ new TemplateString().replaceTokens(
+ "select id from subject where last_modified > ${indexer.last_index_time}",
+ vri));
}
private static Properties EMPTY_PROPS = new Properties();
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
@@ -33,28 +31,28 @@ import java.util.Arrays;
* @version $Id$
* @since solr 1.3
*/
-public class TestTemplateTransformer extends SolrTestCaseJ4 {
+public class TestTemplateTransformer extends AbstractDataImportHandlerTestCase {
@Test
@SuppressWarnings("unchecked")
public void testTransformRow() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "firstName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "lastName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "middleName"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "name",
+ fields.add(createMap("column", "firstName"));
+ fields.add(createMap("column", "lastName"));
+ fields.add(createMap("column", "middleName"));
+ fields.add(createMap("column", "name",
TemplateTransformer.TEMPLATE,
"${e.lastName}, ${e.firstName} ${e.middleName}"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "emails",
+ fields.add(createMap("column", "emails",
TemplateTransformer.TEMPLATE,
"${e.mail}"));
// test reuse of template output in another template
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "mrname",
+ fields.add(createMap("column", "mrname",
TemplateTransformer.TEMPLATE,"Mr ${e.name}"));
List<String> mails = Arrays.asList(new String[]{"a@b.com", "c@d.com"});
- Map row = AbstractDataImportHandlerTestCase.createMap(
+ Map row = createMap(
"firstName", "Shalin",
"middleName", "Shekhar",
"lastName", "Mangar",
@@ -62,15 +60,14 @@ public class TestTemplateTransformer ext
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
- "name", "e");
+ Map<String, String> entityAttrs = createMap("name", "e");
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver,
+ Context context = getContext(null, resolver,
null, Context.FULL_DUMP, fields, entityAttrs);
new TemplateTransformer().transformRow(row, context);
- Assert.assertEquals("Mangar, Shalin Shekhar", row.get("name"));
- Assert.assertEquals("Mr Mangar, Shalin Shekhar", row.get("mrname"));
- Assert.assertEquals(mails,row.get("emails"));
+ assertEquals("Mangar, Shalin Shekhar", row.get("name"));
+ assertEquals("Mr Mangar, Shalin Shekhar", row.get("mrname"));
+ assertEquals(mails,row.get("emails"));
}
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestThreaded.java Wed Oct 13 16:11:07 2010
@@ -16,6 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
+import org.junit.BeforeClass;
import org.junit.Test;
import java.util.List;
@@ -24,6 +25,11 @@ import java.util.Map;
public class TestThreaded extends AbstractDataImportHandlerTestCase {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
+ }
+
@Test
@SuppressWarnings("unchecked")
public void testCompositePk_FullImport() throws Exception {
@@ -44,23 +50,14 @@ public class TestThreaded extends Abstra
MockDataSource.setIterator("select * from y where y.A=3", childRow.iterator());
MockDataSource.setIterator("select * from y where y.A=4", childRow.iterator());
- super.runFullImport(dataConfig);
+ runFullImport(dataConfig);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("*:*"), "//*[@numFound='4']");
assertQ(req("desc:hello"), "//*[@numFound='4']");
}
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
- private static String dataConfig = "<dataConfig>\n"
+ private static String dataConfig = "<dataConfig>\n"
+"<dataSource type=\"MockDataSource\"/>\n"
+ " <document>\n"
+ " <entity name=\"x\" threads=\"2\" query=\"select * from x\" deletedPkQuery=\"select id from x where last_modified > NOW AND deleted='true'\" deltaQuery=\"select id from x where last_modified > NOW\">\n"
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestURLDataSource.java Wed Oct 13 16:11:07 2010
@@ -22,12 +22,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import junit.framework.Assert;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.junit.Test;
-public class TestURLDataSource extends SolrTestCaseJ4 {
+public class TestURLDataSource extends AbstractDataImportHandlerTestCase {
private List<Map<String, String>> fields = new ArrayList<Map<String, String>>();
private URLDataSource dataSource = new URLDataSource();
private VariableResolverImpl variableResolver = new VariableResolverImpl();
@@ -43,6 +40,6 @@ public class TestURLDataSource extends S
initProps.setProperty(URLDataSource.BASE_URL, "${dataimporter.request.baseurl}");
dataSource.init(context, initProps);
- Assert.assertEquals(url, dataSource.getBaseUrl());
+ assertEquals(url, dataSource.getBaseUrl());
}
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java Wed Oct 13 16:11:07 2010
@@ -16,9 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
-import org.junit.Assert;
import org.junit.Test;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.DateMathParser;
import java.text.SimpleDateFormat;
@@ -32,7 +30,7 @@ import java.util.*;
* @version $Id$
* @since solr 1.3
*/
-public class TestVariableResolver extends SolrTestCaseJ4 {
+public class TestVariableResolver extends AbstractDataImportHandlerTestCase {
@Test
public void testSimpleNamespace() {
@@ -40,7 +38,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace("hello", ns);
- Assert.assertEquals("WORLD", vri.resolve("hello.world"));
+ assertEquals("WORLD", vri.resolve("hello.world"));
}
@Test
@@ -54,9 +52,8 @@ public class TestVariableResolver extend
VariableResolverImpl vri = new VariableResolverImpl(m);
Object val = vri.resolve(TestVariableResolver.class.getName());
// System.out.println("val = " + val);
- Assert.assertEquals("hello", val);
- Assert.assertEquals("world",vri.resolve("hello"));
-
+ assertEquals("hello", val);
+ assertEquals("world",vri.resolve("hello"));
}
@Test
@@ -68,7 +65,7 @@ public class TestVariableResolver extend
ns = new HashMap<String, Object>();
ns.put("world1", "WORLD1");
vri.addNamespace("hello.my", ns);
- Assert.assertEquals("WORLD1", vri.resolve("hello.my.world1"));
+ assertEquals("WORLD1", vri.resolve("hello.my.world1"));
}
@Test
@@ -80,7 +77,7 @@ public class TestVariableResolver extend
ns = new HashMap<String, Object>();
ns.put("world1", "WORLD1");
vri.addNamespace("hello.my.new", ns);
- Assert.assertEquals("WORLD1", vri.resolve("hello.my.new.world1"));
+ assertEquals("WORLD1", vri.resolve("hello.my.new.world1"));
}
@Test
@@ -95,7 +92,7 @@ public class TestVariableResolver extend
Date d = new Date();
ns.put("dt", d);
vri.addNamespace("A", ns);
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d),
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(d),
vri.replaceTokens("${dataimporter.functions.formatDate(A.dt,'yyyy-MM-dd HH:mm:ss')}"));
} finally {
Context.CURRENT_CONTEXT.remove();
@@ -117,7 +114,7 @@ public class TestVariableResolver extend
DateMathParser dmp = new DateMathParser(TimeZone.getDefault(), Locale.getDefault());
String s = vri.replaceTokens("${dataimporter.functions.formatDate('NOW/DAY','yyyy-MM-dd HH:mm')}");
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(dmp.parseMath("/DAY")), s);
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(dmp.parseMath("/DAY")), s);
} finally {
Context.CURRENT_CONTEXT.remove();
}
@@ -129,7 +126,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace(null, ns);
- Assert.assertEquals("WORLD", vri.resolve("world"));
+ assertEquals("WORLD", vri.resolve("world"));
}
@Test
@@ -138,7 +135,7 @@ public class TestVariableResolver extend
Map<String, Object> ns = new HashMap<String, Object>();
ns.put("world", "WORLD");
vri.addNamespace(null, ns);
- Assert.assertEquals("WORLD", vri.resolve("world"));
+ assertEquals("WORLD", vri.resolve("world"));
}
@Test
@@ -162,9 +159,9 @@ public class TestVariableResolver extend
.getFunctionsNamespace(l,null));
String s = resolver
.replaceTokens("${dataimporter.functions.formatDate('NOW/DAY','yyyy-MM-dd HH:mm')}");
- Assert.assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm")
+ assertEquals(new SimpleDateFormat("yyyy-MM-dd HH:mm")
.format(dmp.parseMath("/DAY")), s);
- Assert.assertEquals("Hello World", resolver
+ assertEquals("Hello World", resolver
.replaceTokens("${dataimporter.functions.test('TEST')}"));
} finally {
Context.CURRENT_CONTEXT.remove();
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Wed Oct 13 16:11:07 2010
@@ -16,10 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.createMap;
-
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.io.File;
@@ -39,7 +35,7 @@ import java.util.concurrent.TimeUnit;
* @version $Id$
* @since solr 1.3
*/
-public class TestXPathEntityProcessor extends SolrTestCaseJ4 {
+public class TestXPathEntityProcessor extends AbstractDataImportHandlerTestCase {
boolean simulateSlowReader;
boolean simulateSlowResultProcessor;
int rowsToRead = -1;
@@ -58,7 +54,7 @@ public class TestXPathEntityProcessor ex
fields.add(createMap("column", "title", "xpath", "/catalog/cd/title"));
fields.add(createMap("column", "artist", "xpath", "/catalog/cd/artist"));
fields.add(createMap("column", "year", "xpath", "/catalog/cd/year"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -69,10 +65,10 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(3, result.size());
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals(3, result.size());
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
@Test
@@ -81,7 +77,7 @@ public class TestXPathEntityProcessor ex
XPathEntityProcessor.FOR_EACH, "/root");
List fields = new ArrayList();
fields.add(createMap("column", "a", "xpath", "/root/a", DataImporter.MULTI_VALUED, "true"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(testXml), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -92,7 +88,7 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(2, ((List)result.get(0).get("a")).size());
+ assertEquals(2, ((List)result.get(0).get("a")).size());
}
@Test
@@ -101,7 +97,7 @@ public class TestXPathEntityProcessor ex
XPathEntityProcessor.FOR_EACH, "/root");
List fields = new ArrayList();
fields.add(createMap("column", "a", "xpath", "/root/a" ,"flatten","true"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(testXmlFlatten), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -112,7 +108,7 @@ public class TestXPathEntityProcessor ex
break;
result = row;
}
- Assert.assertEquals("1B2", result.get("a"));
+ assertEquals("1B2", result.get("a"));
}
@Test
@@ -126,7 +122,7 @@ public class TestXPathEntityProcessor ex
fields.add(createMap("column", "title", "xpath", "/catalog/cd/title"));
fields.add(createMap("column", "artist", "xpath", "/catalog/cd/artist"));
fields.add(createMap("column", "year", "xpath", "/catalog/cd/year"));
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, fields, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor() {
private int count;
@@ -180,14 +176,14 @@ public class TestXPathEntityProcessor ex
// confirm that publisher thread stops.
xPathEntityProcessor.publisherThread.join(1000);
- Assert.assertEquals("Expected thread to stop", false, xPathEntityProcessor.publisherThread.isAlive());
+ assertEquals("Expected thread to stop", false, xPathEntityProcessor.publisherThread.isAlive());
- Assert.assertEquals(rowsToRead < 0 ? 3 : rowsToRead, result.size());
+ assertEquals(rowsToRead < 0 ? 3 : rowsToRead, result.size());
if (rowsToRead < 0) {
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
}
@@ -221,7 +217,7 @@ public class TestXPathEntityProcessor ex
Map entityAttrs = createMap("name", "e",
XPathEntityProcessor.USE_SOLR_ADD_SCHEMA, "true", "xsl", ""
+ new File(tmpdir, "x.xsl").getAbsolutePath(), "url", "cd.xml");
- Context c = AbstractDataImportHandlerTestCase.getContext(null,
+ Context c = getContext(null,
new VariableResolverImpl(), getDataSource(cdData), Context.FULL_DUMP, null, entityAttrs);
XPathEntityProcessor xPathEntityProcessor = new XPathEntityProcessor();
xPathEntityProcessor.init(c);
@@ -232,10 +228,10 @@ public class TestXPathEntityProcessor ex
break;
result.add(row);
}
- Assert.assertEquals(3, result.size());
- Assert.assertEquals("Empire Burlesque", result.get(0).get("title"));
- Assert.assertEquals("Bonnie Tyler", result.get(1).get("artist"));
- Assert.assertEquals("1982", result.get(2).get("year"));
+ assertEquals(3, result.size());
+ assertEquals("Empire Burlesque", result.get(0).get("title"));
+ assertEquals("Bonnie Tyler", result.get(1).get("artist"));
+ assertEquals("1982", result.get(2).get("year"));
}
private DataSource<Reader> getDataSource(final String xml) {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java?rev=1022165&r1=1022164&r2=1022165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathRecordReader.java Wed Oct 13 16:11:07 2010
@@ -16,8 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
-import org.junit.Assert;
import org.junit.Test;
import java.io.StringReader;
@@ -31,9 +29,9 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestXPathRecordReader extends SolrTestCaseJ4 {
+public class TestXPathRecordReader extends AbstractDataImportHandlerTestCase {
@Test
- public void basic() {
+ public void testBasic() {
String xml="<root>\n"
+ " <b><c>Hello C1</c>\n"
+ " <c>Hello C1</c>\n"
@@ -44,13 +42,13 @@ public class TestXPathRecordReader exten
XPathRecordReader rr = new XPathRecordReader("/root/b");
rr.addField("c", "/root/b/c", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(2, ((List) l.get(0).get("c")).size());
- Assert.assertEquals(1, ((List) l.get(1).get("c")).size());
+ assertEquals(2, l.size());
+ assertEquals(2, ((List) l.get(0).get("c")).size());
+ assertEquals(1, ((List) l.get(1).get("c")).size());
}
@Test
- public void attributes() {
+ public void testAttributes() {
String xml="<root>\n"
+ " <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -60,17 +58,17 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/b/@a", false);
rr.addField("b", "/root/b/@b", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(3, l.size());
- Assert.assertEquals("x0", l.get(0).get("a"));
- Assert.assertEquals("x1", l.get(1).get("a"));
- Assert.assertEquals("x2", l.get(2).get("a"));
- Assert.assertEquals("y0", l.get(0).get("b"));
- Assert.assertEquals("y1", l.get(1).get("b"));
- Assert.assertEquals("y2", l.get(2).get("b"));
+ assertEquals(3, l.size());
+ assertEquals("x0", l.get(0).get("a"));
+ assertEquals("x1", l.get(1).get("a"));
+ assertEquals("x2", l.get(2).get("a"));
+ assertEquals("y0", l.get(0).get("b"));
+ assertEquals("y1", l.get(1).get("b"));
+ assertEquals("y2", l.get(2).get("b"));
}
@Test
- public void attrInRoot(){
+ public void testAttrInRoot(){
String xml="<r>\n" +
"<merchantProduct id=\"814636051\" mid=\"189973\">\n" +
" <in_stock type=\"stock-4\" />\n" +
@@ -91,20 +89,20 @@ public class TestXPathRecordReader exten
rr.addField("conditionType", "/r/merchantProduct/condition/@type", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> m = l.get(0);
- Assert.assertEquals("814636051", m.get("id"));
- Assert.assertEquals("189973", m.get("mid"));
- Assert.assertEquals("301.46", m.get("price"));
- Assert.assertEquals("cond-0", m.get("conditionType"));
+ assertEquals("814636051", m.get("id"));
+ assertEquals("189973", m.get("mid"));
+ assertEquals("301.46", m.get("price"));
+ assertEquals("cond-0", m.get("conditionType"));
m = l.get(1);
- Assert.assertEquals("814636052", m.get("id"));
- Assert.assertEquals("189974", m.get("mid"));
- Assert.assertEquals("302.46", m.get("price"));
- Assert.assertEquals("cond-1", m.get("conditionType"));
+ assertEquals("814636052", m.get("id"));
+ assertEquals("189974", m.get("mid"));
+ assertEquals("302.46", m.get("price"));
+ assertEquals("cond-1", m.get("conditionType"));
}
@Test
- public void attributes2Level() {
+ public void testAttributes2Level() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -115,13 +113,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/@a", false);
rr.addField("b", "/root/a/b/@b", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(3, l.size());
- Assert.assertEquals("x0", l.get(0).get("a"));
- Assert.assertEquals("y1", l.get(1).get("b"));
+ assertEquals(3, l.size());
+ assertEquals("x0", l.get(0).get("a"));
+ assertEquals("y1", l.get(1).get("b"));
}
@Test
- public void attributes2LevelHetero() {
+ public void testAttributes2LevelHetero() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -148,12 +146,12 @@ public class TestXPathRecordReader exten
}
});
- Assert.assertEquals(1, a.size());
- Assert.assertEquals(1, x.size());
+ assertEquals(1, a.size());
+ assertEquals(1, x.size());
}
@Test
- public void attributes2LevelMissingAttrVal() {
+ public void testAttributes2LevelMissingAttrVal() {
String xml="<root>\n"
+ "<a>\n <b a=\"x0\" b=\"y0\" />\n"
+ " <b a=\"x1\" b=\"y1\" />\n"
@@ -166,13 +164,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/@a", true);
rr.addField("b", "/root/a/b/@b", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertNull(((List) l.get(1).get("a")).get(1));
- Assert.assertNull(((List) l.get(1).get("b")).get(0));
+ assertEquals(2, l.size());
+ assertNull(((List) l.get(1).get("a")).get(1));
+ assertNull(((List) l.get(1).get("b")).get(0));
}
@Test
- public void elems2LevelMissing() {
+ public void testElems2LevelMissing() {
String xml="<root>\n"
+ "\t<a>\n"
+ "\t <b>\n\t <x>x0</x>\n"
@@ -191,13 +189,13 @@ public class TestXPathRecordReader exten
rr.addField("a", "/root/a/b/x", true);
rr.addField("b", "/root/a/b/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertNull(((List) l.get(1).get("a")).get(1));
- Assert.assertNull(((List) l.get(1).get("b")).get(0));
+ assertEquals(2, l.size());
+ assertNull(((List) l.get(1).get("a")).get(1));
+ assertNull(((List) l.get(1).get("b")).get(0));
}
@Test
- public void mixedContent() {
+ public void testMixedContent() {
String xml = "<xhtml:p xmlns:xhtml=\"http://xhtml.com/\" >This text is \n" +
" <xhtml:b>bold</xhtml:b> and this text is \n" +
" <xhtml:u>underlined</xhtml:u>!\n" +
@@ -209,18 +207,18 @@ public class TestXPathRecordReader exten
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> row = l.get(0);
- Assert.assertEquals("bold", ((List) row.get("b")).get(0));
- Assert.assertEquals("underlined", ((List) row.get("u")).get(0));
+ assertEquals("bold", ((List) row.get("b")).get(0));
+ assertEquals("underlined", ((List) row.get("u")).get(0));
String p = (String) ((List) row.get("p")).get(0);
- Assert.assertTrue(p.contains("This text is"));
- Assert.assertTrue(p.contains("and this text is"));
- Assert.assertTrue(p.contains("!"));
+ assertTrue(p.contains("This text is"));
+ assertTrue(p.contains("and this text is"));
+ assertTrue(p.contains("!"));
// Should not contain content from child elements
- Assert.assertFalse(p.contains("bold"));
+ assertFalse(p.contains("bold"));
}
@Test
- public void mixedContentFlattened() {
+ public void testMixedContentFlattened() {
String xml = "<xhtml:p xmlns:xhtml=\"http://xhtml.com/\" >This text is \n" +
" <xhtml:b>bold</xhtml:b> and this text is \n" +
" <xhtml:u>underlined</xhtml:u>!\n" +
@@ -229,13 +227,13 @@ public class TestXPathRecordReader exten
rr.addField("p", "/p", false, XPathRecordReader.FLATTEN);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
Map<String, Object> row = l.get(0);
- Assert.assertEquals("This text is \n" +
+ assertEquals("This text is \n" +
" bold and this text is \n" +
" underlined!", ((String)row.get("p")).trim() );
}
@Test
- public void elems2LevelWithAttrib() {
+ public void testElems2LevelWithAttrib() {
String xml = "<root>\n\t<a>\n\t <b k=\"x\">\n"
+ "\t <x>x0</x>\n"
+ "\t <y>y0</y>\n"
@@ -257,14 +255,14 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k]/x", true);
rr.addField("y", "/root/a/b[@k]/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(2, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(2, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(2, ((List) l.get(0).get("x")).size());
+ assertEquals(2, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void elems2LevelWithAttribMultiple() {
+ public void testElems2LevelWithAttribMultiple() {
String xml="<root>\n"
+ "\t<a>\n\t <b k=\"x\" m=\"n\" >\n"
+ "\t <x>x0</x>\n"
@@ -287,14 +285,14 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k][@m='n']/x", true);
rr.addField("y", "/root/a/b[@k][@m='n']/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(1, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(1, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(1, ((List) l.get(0).get("x")).size());
+ assertEquals(1, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void elems2LevelWithAttribVal() {
+ public void testElems2LevelWithAttribVal() {
String xml="<root>\n\t<a>\n <b k=\"x\">\n"
+ "\t <x>x0</x>\n"
+ "\t <y>y0</y>\n"
@@ -311,44 +309,43 @@ public class TestXPathRecordReader exten
rr.addField("x", "/root/a/b[@k='x']/x", true);
rr.addField("y", "/root/a/b[@k='x']/y", true);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(2, l.size());
- Assert.assertEquals(1, ((List) l.get(0).get("x")).size());
- Assert.assertEquals(1, ((List) l.get(0).get("y")).size());
- Assert.assertEquals(0, l.get(1).size());
+ assertEquals(2, l.size());
+ assertEquals(1, ((List) l.get(0).get("x")).size());
+ assertEquals(1, ((List) l.get(0).get("y")).size());
+ assertEquals(0, l.get(1).size());
}
@Test
- public void attribValWithSlash() {
+ public void testAttribValWithSlash() {
String xml = "<root><b>\n" +
" <a x=\"a/b\" h=\"hello-A\"/> \n" +
"</b></root>";
XPathRecordReader rr = new XPathRecordReader("/root/b");
rr.addField("x", "/root/b/a[@x='a/b']/@h", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("hello-A", m.get("x"));
+ assertEquals("hello-A", m.get("x"));
}
@Test
- public void unsupported_Xpaths() {
+ public void testUnsupported_Xpaths() {
String xml = "<root><b><a x=\"a/b\" h=\"hello-A\"/> </b></root>";
XPathRecordReader rr=null;
try {
rr = new XPathRecordReader("//b");
- Assert.fail("A RuntimeException was expected: //b forEach cannot begin with '//'.");
+ fail("A RuntimeException was expected: //b forEach cannot begin with '//'.");
}
catch (RuntimeException ex) { }
try {
rr.addField("bold" ,"b", false);
- Assert.fail("A RuntimeException was expected: 'b' xpaths must begin with '/'.");
+ fail("A RuntimeException was expected: 'b' xpaths must begin with '/'.");
}
catch (RuntimeException ex) { }
-
}
@Test
- public void any_decendent_from_root() {
+ public void testAny_decendent_from_root() {
XPathRecordReader rr = new XPathRecordReader("/anyd/contenido");
rr.addField("descdend", "//boo", true);
rr.addField("inr_descd","//boo/i", false);
@@ -373,22 +370,22 @@ public class TestXPathRecordReader exten
+ "</anyd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("This one is inside a forEach", m.get("cont").toString().trim());
- Assert.assertEquals("10097" ,m.get("id"));
- Assert.assertEquals("My flattened title",m.get("title").toString().trim());
- Assert.assertEquals("My summary" ,m.get("resume").toString().trim());
- Assert.assertEquals("My text" ,m.get("text").toString().trim());
- Assert.assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(0) );
- Assert.assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
- Assert.assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(2) );
- Assert.assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
- Assert.assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
+ assertEquals("This one is inside a forEach", m.get("cont").toString().trim());
+ assertEquals("10097" ,m.get("id"));
+ assertEquals("My flattened title",m.get("title").toString().trim());
+ assertEquals("My summary" ,m.get("resume").toString().trim());
+ assertEquals("My text" ,m.get("text").toString().trim());
+ assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("sub clauses" ,m.get("inr_descd").toString().trim());
}
@Test
- public void any_decendent_of_a_child1() {
+ public void testAny_decendent_of_a_child1() {
XPathRecordReader rr = new XPathRecordReader("/anycd");
rr.addField("descdend", "/anycd//boo", true);
@@ -407,19 +404,19 @@ public class TestXPathRecordReader exten
+ "</anycd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
- Assert.assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
- Assert.assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(2) );
- Assert.assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
- Assert.assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
- Assert.assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(5) );
- Assert.assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
+ assertEquals("top level" ,(String) ((List) m.get("descdend")).get(0) );
+ assertEquals("this element" ,(String) ((List) m.get("descdend")).get(1) );
+ assertEquals("not ignored as its",(String) ((List) m.get("descdend")).get(2) );
+ assertEquals("antler" ,(String) ((List) m.get("descdend")).get(3) );
+ assertEquals("title" ,(String) ((List) m.get("descdend")).get(4) );
+ assertEquals("Within the body of",(String) ((List) m.get("descdend")).get(5) );
+ assertEquals("inner as well" ,(String) ((List) m.get("descdend")).get(6) );
}
@Test
- public void any_decendent_of_a_child2() {
+ public void testAny_decendent_of_a_child2() {
XPathRecordReader rr = new XPathRecordReader("/anycd");
rr.addField("descdend", "/anycd/contenido//boo", true);
@@ -438,17 +435,17 @@ public class TestXPathRecordReader exten
+ "</anycd>";
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("not ignored as its",((List) m.get("descdend")).get(0) );
- Assert.assertEquals("antler" ,((List) m.get("descdend")).get(1) );
- Assert.assertEquals("title" ,((List) m.get("descdend")).get(2) );
- Assert.assertEquals("Within the body of",((List) m.get("descdend")).get(3) );
- Assert.assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
+ assertEquals("not ignored as its",((List) m.get("descdend")).get(0) );
+ assertEquals("antler" ,((List) m.get("descdend")).get(1) );
+ assertEquals("title" ,((List) m.get("descdend")).get(2) );
+ assertEquals("Within the body of",((List) m.get("descdend")).get(3) );
+ assertEquals("inner as well" ,((List) m.get("descdend")).get(4) );
}
@Test
- public void another() {
+ public void testAnother() {
String xml="<root>\n"
+ " <contenido id=\"10097\" idioma=\"cat\">\n"
+ " <antetitulo></antetitulo>\n"
@@ -464,17 +461,17 @@ public class TestXPathRecordReader exten
rr.addField("text", "/root/contenido/texto", false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals(1, l.size());
+ assertEquals(1, l.size());
Map<String, Object> m = l.get(0);
- Assert.assertEquals("10097", m.get("id"));
- Assert.assertEquals("This is my title", m.get("title").toString().trim());
- Assert.assertEquals("This is my summary", m.get("resume").toString().trim());
- Assert.assertEquals("This is the body of my text", m.get("text").toString()
+ assertEquals("10097", m.get("id"));
+ assertEquals("This is my title", m.get("title").toString().trim());
+ assertEquals("This is my summary", m.get("resume").toString().trim());
+ assertEquals("This is the body of my text", m.get("text").toString()
.trim());
}
@Test
- public void sameForEachAndXpath(){
+ public void testSameForEachAndXpath(){
String xml="<root>\n" +
" <cat>\n" +
" <name>hello</name>\n" +
@@ -484,11 +481,11 @@ public class TestXPathRecordReader exten
XPathRecordReader rr = new XPathRecordReader("/root/cat/name");
rr.addField("catName", "/root/cat/name",false);
List<Map<String, Object>> l = rr.getAllRecords(new StringReader(xml));
- Assert.assertEquals("hello",l.get(0).get("catName"));
+ assertEquals("hello",l.get(0).get("catName"));
}
@Test
- public void putNullTest(){
+ public void testPutNullTest(){
String xml = "<root>\n" +
" <i>\n" +
" <x>\n" +
@@ -521,29 +518,29 @@ public class TestXPathRecordReader exten
List<String> b = (List<String>) map.get("b");
List<String> c = (List<String>) map.get("c");
- Assert.assertEquals("A.1.1",a.get(0));
- Assert.assertEquals("B.1.1",b.get(0));
- Assert.assertNull(c.get(0));
-
- Assert.assertNull(a.get(1));
- Assert.assertEquals("B.1.2",b.get(1));
- Assert.assertEquals("C.1.2",c.get(1));
+ assertEquals("A.1.1",a.get(0));
+ assertEquals("B.1.1",b.get(0));
+ assertNull(c.get(0));
+
+ assertNull(a.get(1));
+ assertEquals("B.1.2",b.get(1));
+ assertEquals("C.1.2",c.get(1));
map = l.get(1);
a = (List<String>) map.get("a");
b = (List<String>) map.get("b");
c = (List<String>) map.get("c");
- Assert.assertEquals("A.2.1",a.get(0));
- Assert.assertNull(b.get(0));
- Assert.assertEquals("C.2.1",c.get(0));
-
- Assert.assertNull(a.get(1));
- Assert.assertEquals("B.2.2",b.get(1));
- Assert.assertEquals("C.2.2",c.get(1));
+ assertEquals("A.2.1",a.get(0));
+ assertNull(b.get(0));
+ assertEquals("C.2.1",c.get(0));
+
+ assertNull(a.get(1));
+ assertEquals("B.2.2",b.get(1));
+ assertEquals("C.2.2",c.get(1));
}
- @Test
+ @Test
public void testError(){
String malformedXml = "<root>\n" +
" <node>\n" +
@@ -564,7 +561,7 @@ public class TestXPathRecordReader exten
rr.addField("desc", "/root/node/desc", true);
try {
rr.getAllRecords(new StringReader(malformedXml));
- Assert.fail("A RuntimeException was expected: the input XML is invalid.");
+ fail("A RuntimeException was expected: the input XML is invalid.");
} catch (Exception e) { }
}
}