You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/02/16 20:24:05 UTC
svn commit: r1245129 - in
/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport:
AbstractDataImportHandlerTestCase.java TestCachedSqlEntityProcessor.java
Author: jdyer
Date: Thu Feb 16 19:24:05 2012
New Revision: 1245129
URL: http://svn.apache.org/viewvc?rev=1245129&view=rev
Log:
SOLR-2933: backport test improvement only from Trunk
Modified:
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java?rev=1245129&r1=1245128&r2=1245129&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java Thu Feb 16 19:24:05 2012
@@ -36,6 +36,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.File;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -148,7 +149,7 @@ public abstract class AbstractDataImport
*/
@SuppressWarnings("unchecked")
public static Map createMap(Object... args) {
- Map result = new HashMap();
+ Map result = new LinkedHashMap();
if (args == null || args.length == 0)
return result;
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java?rev=1245129&r1=1245128&r2=1245129&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java Thu Feb 16 19:24:05 2012
@@ -184,7 +184,7 @@ public class TestCachedSqlEntityProcesso
}
@Test
- public void withWhereClause() {
+ public void withKeyAndLookup() {
List fields = new ArrayList();
fields.add(createMap("column", "id"));
fields.add(createMap("column", "desc"));
@@ -200,7 +200,7 @@ public class TestCachedSqlEntityProcesso
}
@Test
- public void withKeyAndLookup() {
+ public void withWhereClause() {
List fields = new ArrayList();
fields.add(createMap("column", "id"));
fields.add(createMap("column", "desc"));
@@ -216,7 +216,7 @@ public class TestCachedSqlEntityProcesso
private void doWhereTest(String q, Context context, MockDataSource ds, Map xNamespace) {
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
- rows.add(createMap("id", 1, "desc", "one"));
+ rows.add(createMap("desc", "one", "id", 1));
rows.add(createMap("id", 2, "desc", "two"));
rows.add(createMap("id", 2, "desc", "another two"));
rows.add(createMap("id", 3, "desc", "three"));