dariah / mtas

Commit 95709a49a47e3c3baa8cf9fe1faef3834fccfca0

Authored by Matthijs Brouwer
1 parent 56028c70

adjust method for test

Inline Side-by-side
Showing 1 changed file with 29 additions and 30 deletions
src/test/java/mtas/solr/MtasSolrTestSearchConsistency.java
  View file @95709a4
... ... @@ -24,7 +24,6 @@ import java.util.Set;
24 24 import org.apache.commons.logging.Log;
25 25 import org.apache.commons.logging.LogFactory;
26 26 import org.apache.solr.client.solrj.SolrRequest;
27   -import org.apache.solr.client.solrj.SolrRequest.METHOD;
28 27 import org.apache.solr.client.solrj.SolrServerException;
29 28 import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
30 29 import org.apache.solr.client.solrj.request.QueryRequest;
... ... @@ -243,7 +242,8 @@ public class MtasSolrTestSearchConsistency {
243 242 params.set("mtas.stats.positions.0.key", "statsKey");
244 243 params.set("mtas.stats.positions.0.type", "n,sum,mean");
245 244 params.set("rows", "0");
246   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  245 + SolrRequest<?> request = new QueryRequest(params);
  246 + //request1.setContentWriter(contentWriter)
247 247 NamedList<Object> response;
248 248 try {
249 249 response = server.request(request, "collection1");
... ... @@ -282,7 +282,7 @@ public class MtasSolrTestSearchConsistency {
282 282 params.set("mtas.stats.tokens.0.type", String.join(",", types));
283 283 params.set("mtas.stats.tokens.0.minimum", 1);
284 284 params.set("mtas.stats.tokens.0.maximum", 1000000);
285   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  285 + SolrRequest<?> request = new QueryRequest(params);
286 286 NamedList<Object> response;
287 287 try {
288 288 response = server.request(request, "collection1");
... ... @@ -316,7 +316,7 @@ public class MtasSolrTestSearchConsistency {
316 316 // create full
317 317 params.set("mtas.termvector.0.full", true);
318 318 params.set("mtas.termvector.0.number", -1);
319   - SolrRequest<?> requestFull = new QueryRequest(params, METHOD.POST);
  319 + SolrRequest<?> requestFull = new QueryRequest(params);
320 320 NamedList<Object> responseFull;
321 321 try {
322 322 responseFull = server.request(requestFull, "collection1");
... ... @@ -328,7 +328,7 @@ public class MtasSolrTestSearchConsistency {
328 328 // create tests
329 329 for (int number = 1; number <= 1000; number *= 10) {
330 330 params.set("mtas.termvector.0.number", number);
331   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  331 + SolrRequest<?> request = new QueryRequest(params);
332 332 NamedList<Object> response;
333 333 try {
334 334 response = server.request(request, "collection1");
... ... @@ -363,7 +363,7 @@ public class MtasSolrTestSearchConsistency {
363 363 params.set("mtas.termvector.0.type", String.join(",", types));
364 364 // create full
365 365 params.set("mtas.termvector.0.list", String.join(",", list));
366   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  366 + SolrRequest<?> request = new QueryRequest(params);
367 367 NamedList<Object> response;
368 368 try {
369 369 response = server.request(request, "collection1");
... ... @@ -392,7 +392,7 @@ public class MtasSolrTestSearchConsistency {
392 392 params.set("mtas.stats.spans.1.query.0.value", "[t_lc=\"" + key + "\"]");
393 393 params.set("mtas.stats.spans.1.type", String.join(",", types));
394 394 params.set("rows", "0");
395   - SolrRequest<?> requestStats = new QueryRequest(params, METHOD.POST);
  395 + SolrRequest<?> requestStats = new QueryRequest(params);
396 396 NamedList<Object> responseStats;
397 397 try {
398 398 responseStats = server.request(requestStats, "collection1");
... ... @@ -445,7 +445,7 @@ public class MtasSolrTestSearchConsistency {
445 445 params.set("mtas.termvector.0.listRegexp", true);
446 446 params.set("mtas.termvector.0.ignoreList", ".*st.*,.*nm.*");
447 447 params.set("mtas.termvector.0.ignoreListRegexp", true);
448   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  448 + SolrRequest<?> request = new QueryRequest(params);
449 449 NamedList<Object> response;
450 450 try {
451 451 response = server.request(request, "collection1");
... ... @@ -489,7 +489,7 @@ public class MtasSolrTestSearchConsistency {
489 489 paramsCreate.set("mtas.collection.0.action", "create");
490 490 paramsCreate.set("mtas.collection.0.id", "idCreate");
491 491 paramsCreate.set("mtas.collection.0.field", "id");
492   - SolrRequest<?> requestCreate = new QueryRequest(paramsCreate, METHOD.POST);
  492 + SolrRequest<?> requestCreate = new QueryRequest(paramsCreate);
493 493 NamedList<Object> responseCreate;
494 494 try {
495 495 responseCreate = server.request(requestCreate, "collection1");
... ... @@ -516,7 +516,7 @@ public class MtasSolrTestSearchConsistency {
516 516 paramsPost.set("mtas.collection.0.action", "post");
517 517 paramsPost.set("mtas.collection.0.id", "idPost");
518 518 paramsPost.set("mtas.collection.0.post", "[1,2,3,4]");
519   - SolrRequest<?> requestPost = new QueryRequest(paramsPost, METHOD.POST);
  519 + SolrRequest<?> requestPost = new QueryRequest(paramsPost);
520 520 NamedList<Object> responsePost;
521 521 try {
522 522 responsePost = server.request(requestPost, "collection1");
... ... @@ -540,7 +540,7 @@ public class MtasSolrTestSearchConsistency {
540 540 paramsList.set("mtas.collection", "true");
541 541 paramsList.set("mtas.collection.0.key", "list");
542 542 paramsList.set("mtas.collection.0.action", "list");
543   - SolrRequest<?> requestList1 = new QueryRequest(paramsList, METHOD.POST);
  543 + SolrRequest<?> requestList1 = new QueryRequest(paramsList);
544 544 NamedList<Object> responseList1;
545 545 try {
546 546 responseList1 = server.request(requestList1, "collection1");
... ... @@ -584,7 +584,7 @@ public class MtasSolrTestSearchConsistency {
584 584 paramsCheck.set("mtas.collection.1.key", "check2");
585 585 paramsCheck.set("mtas.collection.1.action", "check");
586 586 paramsCheck.set("mtas.collection.1.id", "idPost");
587   - SolrRequest<?> requestCheck = new QueryRequest(paramsCheck, METHOD.POST);
  587 + SolrRequest<?> requestCheck = new QueryRequest(paramsCheck);
588 588 NamedList<Object> responseCheck;
589 589 try {
590 590 responseCheck = server.request(requestCheck, "collection1");
... ... @@ -628,7 +628,7 @@ public class MtasSolrTestSearchConsistency {
628 628 paramsDelete.set("mtas.collection.1.key", "delete2");
629 629 paramsDelete.set("mtas.collection.1.action", "delete");
630 630 paramsDelete.set("mtas.collection.1.id", "idPost");
631   - SolrRequest<?> requestDelete = new QueryRequest(paramsDelete, METHOD.POST);
  631 + SolrRequest<?> requestDelete = new QueryRequest(paramsDelete);
632 632 NamedList<Object> responseDelete;
633 633 try {
634 634 responseDelete = server.request(requestDelete, "collection1");
... ... @@ -644,7 +644,7 @@ public class MtasSolrTestSearchConsistency {
644 644 .getFromMtasCollection(responseDelete, "delete2");
645 645 assertFalse("delete - post - no response", delete2 == null);
646 646 // list (again)
647   - SolrRequest<?> requestList2 = new QueryRequest(paramsList, METHOD.POST);
  647 + SolrRequest<?> requestList2 = new QueryRequest(paramsList);
648 648 NamedList<Object> responseList2;
649 649 try {
650 650 responseList2 = server.request(requestList2, "collection1");
... ... @@ -686,7 +686,7 @@ public class MtasSolrTestSearchConsistency {
686 686 paramsPost.set("mtas.collection.2.action", "create");
687 687 paramsPost.set("mtas.collection.2.id", "createSet1");
688 688 paramsPost.set("mtas.collection.2.field", MtasSolrBase.FIELD_ID);
689   - SolrRequest<?> requestPost = new QueryRequest(paramsPost, METHOD.POST);
  689 + SolrRequest<?> requestPost = new QueryRequest(paramsPost);
690 690 NamedList<Object> responsePost;
691 691 try {
692 692 responsePost = server.request(requestPost, "collection1");
... ... @@ -699,7 +699,7 @@ public class MtasSolrTestSearchConsistency {
699 699 paramsSelect1.set("q", "{!mtas_join field=\"" + MtasSolrBase.FIELD_ID
700 700 + "\" collection=\"postSet1\"}");
701 701 paramsSelect1.set("rows", "0");
702   - SolrRequest<?> request1 = new QueryRequest(paramsSelect1, METHOD.POST);
  702 + SolrRequest<?> request1 = new QueryRequest(paramsSelect1);
703 703 NamedList<Object> response1;
704 704 try {
705 705 response1 = server.request(request1, "collection1");
... ... @@ -713,7 +713,7 @@ public class MtasSolrTestSearchConsistency {
713 713 paramsSelect2.set("q", "{!mtas_join field=\"" + MtasSolrBase.FIELD_ID
714 714 + "\" collection=\"postSet2\"}");
715 715 paramsSelect2.set("rows", "0");
716   - SolrRequest<?> request2 = new QueryRequest(paramsSelect2, METHOD.POST);
  716 + SolrRequest<?> request2 = new QueryRequest(paramsSelect2);
717 717 NamedList<Object> response2;
718 718 try {
719 719 response2 = server.request(request2, "collection1");
... ... @@ -727,7 +727,7 @@ public class MtasSolrTestSearchConsistency {
727 727 paramsSelect3.set("q", "{!mtas_join field=\"" + MtasSolrBase.FIELD_ID
728 728 + "\" collection=\"createSet1\"}");
729 729 paramsSelect3.set("rows", "0");
730   - SolrRequest<?> request3 = new QueryRequest(paramsSelect3, METHOD.POST);
  730 + SolrRequest<?> request3 = new QueryRequest(paramsSelect3);
731 731 NamedList<Object> response3;
732 732 try {
733 733 response3 = server.request(request3, "collection1");
... ... @@ -743,7 +743,7 @@ public class MtasSolrTestSearchConsistency {
743 743 + "\" collection=\"postSet1\"}) OR ({!mtas_join field=\""
744 744 + MtasSolrBase.FIELD_ID + "\" collection=\"postSet2\"})");
745 745 paramsSelect4.set("rows", "0");
746   - SolrRequest<?> request4 = new QueryRequest(paramsSelect4, METHOD.POST);
  746 + SolrRequest<?> request4 = new QueryRequest(paramsSelect4);
747 747 NamedList<Object> response4;
748 748 try {
749 749 response4 = server.request(request4, "collection1");
... ... @@ -771,7 +771,7 @@ public class MtasSolrTestSearchConsistency {
771 771 paramsPost.set("mtas.collection.0.action", "post");
772 772 paramsPost.set("mtas.collection.0.id", "setCreatedByPost");
773 773 paramsPost.set("mtas.collection.0.post", "[1,3,4]");
774   - SolrRequest<?> requestPost = new QueryRequest(paramsPost, METHOD.POST);
  774 + SolrRequest<?> requestPost = new QueryRequest(paramsPost);
775 775 try {
776 776 server.request(requestPost, "collection1");
777 777 } catch (SolrServerException e) {
... ... @@ -786,7 +786,7 @@ public class MtasSolrTestSearchConsistency {
786 786 paramsImport.set("mtas.collection.0.action", "post");
787 787 paramsImport.set("mtas.collection.0.id", "setCreatedByImport");
788 788 paramsImport.set("mtas.collection.0.post", "[1,3,4]");
789   - SolrRequest<?> requestImport = new QueryRequest(paramsImport, METHOD.POST);
  789 + SolrRequest<?> requestImport = new QueryRequest(paramsImport);
790 790 try {
791 791 server.request(requestImport, "collection1");
792 792 } catch (SolrServerException e) {
... ... @@ -797,7 +797,7 @@ public class MtasSolrTestSearchConsistency {
797 797 paramsSelect1.set("q", "{!mtas_join field=\"" + MtasSolrBase.FIELD_ID
798 798 + "\" collection=\"setCreatedByPost\"}");
799 799 paramsSelect1.set("rows", "0");
800   - SolrRequest<?> request1 = new QueryRequest(paramsSelect1, METHOD.POST);
  800 + SolrRequest<?> request1 = new QueryRequest(paramsSelect1);
801 801 NamedList<Object> response1;
802 802 try {
803 803 response1 = server.request(request1, "collection1");
... ... @@ -811,7 +811,7 @@ public class MtasSolrTestSearchConsistency {
811 811 paramsSelect2.set("q", "{!mtas_join field=\"" + MtasSolrBase.FIELD_ID
812 812 + "\" collection=\"setCreatedByImport\"}");
813 813 paramsSelect2.set("rows", "0");
814   - SolrRequest<?> request2 = new QueryRequest(paramsSelect2, METHOD.POST);
  814 + SolrRequest<?> request2 = new QueryRequest(paramsSelect2);
815 815 NamedList<Object> response2;
816 816 try {
817 817 response2 = server.request(request2, "collection1");
... ... @@ -842,7 +842,7 @@ public class MtasSolrTestSearchConsistency {
842 842 params.set("mtas.group.0.query.type", "cql");
843 843 params.set("mtas.group.0.query.value", cql);
844 844 params.set("mtas.group.0.grouping.hit.inside.prefixes", prefix);
845   - SolrRequest<?> requestGroup = new QueryRequest(params, METHOD.POST);
  845 + SolrRequest<?> requestGroup = new QueryRequest(params);
846 846 NamedList<Object> responseGroup = null;
847 847 try {
848 848 responseGroup = server.request(requestGroup, "collection1");
... ... @@ -863,7 +863,7 @@ public class MtasSolrTestSearchConsistency {
863 863 params.set("mtas.stats.spans.0.query.0.value", cql);
864 864 params.set("mtas.stats.spans.0.type", "n,sum");
865 865 params.set("rows", "0");
866   - SolrRequest<?> requestStats = new QueryRequest(params, METHOD.POST);
  866 + SolrRequest<?> requestStats = new QueryRequest(params);
867 867 NamedList<Object> responseStats = null;
868 868 try {
869 869 responseStats = server.request(requestStats, "collection1");
... ... @@ -912,8 +912,7 @@ public class MtasSolrTestSearchConsistency {
912 912 params.set("mtas.stats.spans.0.query.0.value", subcql);
913 913 params.set("mtas.stats.spans.0.type", "n,sum");
914 914 params.set("rows", "0");
915   - SolrRequest<?> requestSubStats = new QueryRequest(params,
916   - METHOD.POST);
  915 + SolrRequest<?> requestSubStats = new QueryRequest(params);
917 916 NamedList<Object> responseSubStats = null;
918 917 try {
919 918 responseSubStats = server.request(requestSubStats,
... ... @@ -1062,7 +1061,7 @@ public class MtasSolrTestSearchConsistency {
1062 1061 params.set("mtas.stats.tokens.0.key", "statsKey");
1063 1062 params.set("mtas.stats.tokens.0.type", "n,sum,sumsq");
1064 1063 params.set("rows", "0");
1065   - SolrRequest<?> request = new QueryRequest(params, METHOD.POST);
  1064 + SolrRequest<?> request = new QueryRequest(params);
1066 1065 NamedList<Object> response1;
1067 1066 NamedList<Object> response2;
1068 1067 try {
... ... @@ -1157,7 +1156,7 @@ public class MtasSolrTestSearchConsistency {
1157 1156 for (Entry<String, String> entry : grouping.entrySet()) {
1158 1157 params.set("mtas.group.0.grouping." + entry.getKey(), entry.getValue());
1159 1158 }
1160   - SolrRequest<?> requestGroup = new QueryRequest(params, METHOD.POST);
  1159 + SolrRequest<?> requestGroup = new QueryRequest(params);
1161 1160 NamedList<Object> responseGroup = null;
1162 1161 try {
1163 1162 responseGroup = server.request(requestGroup, "collection1");
... ... @@ -1179,7 +1178,7 @@ public class MtasSolrTestSearchConsistency {
1179 1178 params.set("mtas.stats.spans.0.query.0.value", cql);
1180 1179 params.set("mtas.stats.spans.0.type", "n,sum");
1181 1180 params.set("rows", "0");
1182   - SolrRequest<?> requestStats = new QueryRequest(params, METHOD.POST);
  1181 + SolrRequest<?> requestStats = new QueryRequest(params);
1183 1182 NamedList<Object> responseStats = null;
1184 1183 try {
1185 1184 responseStats = server.request(requestStats, "collection1");
... ...