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:17:11 UTC
svn commit: r1022170 [5/8] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/ind...
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 13 16:17:05 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,9
99545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,9
99545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022165
/lucene/dev/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java:748824
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 13 16:17:05 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781
,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,9
99842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963781
,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,9
99842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022165
/lucene/dev/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/spans/TestSpans.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/search/spans/TestSpans.java:748824
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 13 16:17:05 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:967125-979432
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,9637
20,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223
,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,9637
20,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268,996357,996416,996511,996611,996623,996647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223
,999545,999842,1000424,1000581,1000675,1001006,1001420,1001661,1001796,1003614,1003631,1003645,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022165
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334,948516
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 13 16:17:05 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/solr:967125-979432
-/lucene/dev/trunk/solr:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,960719,961941,962555,962714,963372,
963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,995772,996268,996357,996416,996511,996611,996623,99
6647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1002032,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022111
+/lucene/dev/trunk/solr:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940556,940666,940699,940730,940878-940892,940994,941270,941363,942166,942235,942288,942676,942719,943142,943493,943931,944516,944528,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950125,950207,950458,950613,950723,950835,951126,951355,951397,951521,953628,953886,954336,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960374,960719,961941,962555,962714,963372,
963654,963720,963781,963873,963888,963906,963909,963920,964019,964054,964267,964430,964459,964720,964753,964832,964856,965103,965222,965230,965327,965330,965585,965938,966354,966878,967080,979049,979453,979807,979809,980369,980428,980436,980501,980555,980592,980909,980911,980917,981265,981550,981598,981650,981661,981690,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983632,983778,984187,984202,984232,984510,984968,985453,985455,985672,985875,986158,986612,986773,987005,987009,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991497,992424,992469,992567,992571,992623,992913,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995253,995264,995286,995376,995557,995772,996268,996357,996416,996511,996611,996623,99
6647-996653,996720,996942,996978,997180,997230,998055,998505,998684,999016,999223,999545,999842,1000000,1000424,1000581,1000675,1001006,1001318,1001320,1001420,1001661,1001957,1002032,1003107,1003614,1003631,1003645,1003703,1003841-1003852,1003873,1003877,1003906,1003938,1003954,1003978,1003990,1004038,1004082,1004179,1004200,1004215,1004241,1004335,1005310,1005356,1005363,1006146,1006290,1006324,1021340,1021357,1021360,1021449,1021969-1021971,1022111,1022165
/lucene/java/branches/lucene_2_4/solr:748824
/lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java Wed Oct 13 16:17:05 2010
@@ -16,9 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.Assert;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrInputDocument;
import org.junit.Ignore;
import org.junit.Test;
@@ -47,7 +44,7 @@ import java.util.Map;
* @see org.apache.solr.handler.dataimport.MailEntityProcessor
* @since solr 1.4
*/
-public class TestMailEntityProcessor extends SolrTestCaseJ4 {
+public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
// Credentials
private static final String user = "user";
@@ -72,7 +69,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top1 did not return 2 messages", swi.docs.size(), 2);
+ assertEquals("top1 did not return 2 messages", swi.docs.size(), 2);
}
@Test
@@ -89,7 +86,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top2 and its children did not return 8 messages", swi.docs.size(), 8);
+ assertEquals("top2 and its children did not return 8 messages", swi.docs.size(), 8);
}
@Test
@@ -107,7 +104,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top2 and its direct children did not return 5 messages", swi.docs.size(), 5);
+ assertEquals("top2 and its direct children did not return 5 messages", swi.docs.size(), 5);
}
@Test
@@ -125,7 +122,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
+ assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
}
@Test
@@ -144,7 +141,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
+ assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
}
@Test
@@ -162,7 +159,7 @@ public class TestMailEntityProcessor ext
rp.command = "full-import";
SolrWriterImpl swi = new SolrWriterImpl();
di.runCmd(rp, swi);
- Assert.assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
+ assertEquals("top2 and its direct children did not return 3 messages", swi.docs.size(), 3);
}
private String getConfigFromMap(Map<String, String> params) {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/extras/test/java/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java Wed Oct 13 16:17:05 2010
@@ -16,31 +16,16 @@
*/
package org.apache.solr.handler.dataimport;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.BeforeClass;
/**Testcase for TikaEntityProcessor
* @version $Id$
* @since solr 1.5
*/
public class TestTikaEntityProcessor extends AbstractDataImportHandlerTestCase {
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- public String getSchemaFile() {
- return "dataimport-schema-no-unique-key.xml";
- }
-
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema-no-unique-key.xml");
}
public void testIndexingWithTikaEntityProcessor() throws Exception {
@@ -55,7 +40,7 @@ public class TestTikaEntityProcessor ext
" </entity>" +
" </document>" +
"</dataConfig>";
- super.runFullImport(conf);
+ runFullImport(conf);
assertQ(req("*:*"), "//*[@numFound='1']");
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java Wed Oct 13 16:17:05 2010
@@ -16,11 +16,14 @@
*/
package org.apache.solr.handler.dataimport;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
-import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.common.util.NamedList;
+import org.junit.After;
+import org.junit.Before;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.File;
import java.util.HashMap;
@@ -38,14 +41,16 @@ import java.util.Map;
* @since solr 1.3
*/
public abstract class AbstractDataImportHandlerTestCase extends
- AbstractSolrTestCase {
+ SolrTestCaseJ4 {
@Override
+ @Before
public void setUp() throws Exception {
super.setUp();
}
@Override
+ @After
public void tearDown() throws Exception {
// remove dataimport.properties
File f = new File("solr/conf/dataimport.properties");
@@ -140,6 +145,29 @@ public abstract class AbstractDataImport
return result;
}
+ public static File createFile(File tmpdir, String name, byte[] content,
+ boolean changeModifiedTime) throws IOException {
+ File file = new File(tmpdir.getAbsolutePath() + File.separator + name);
+ file.deleteOnExit();
+ FileOutputStream f = new FileOutputStream(file);
+ f.write(content);
+ f.close();
+ if (changeModifiedTime)
+ file.setLastModified(System.currentTimeMillis() - 3600000);
+ return file;
+ }
+
+ 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;
+ }
+
static class TestContext extends Context {
private final Map<String, String> entityAttrs;
private final Context delegate;
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java Wed Oct 13 16:17:05 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,25 +31,23 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestCachedSqlEntityProcessor extends SolrTestCaseJ4 {
+public class TestCachedSqlEntityProcessor extends AbstractDataImportHandlerTestCase {
@Test
public void withoutWhereClause() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
+ fields.add(createMap("column", "id"));
+ fields.add(createMap("column", "desc"));
String q = "select * from x where id=${x.id}";
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
- "query", q);
+ Map<String, String> entityAttrs = createMap("query", q);
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- vr.addNamespace("x", AbstractDataImportHandlerTestCase.createMap("id", 1));
- Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ vr.addNamespace("x", createMap("id", 1));
+ Context context = getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc", "one"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc",
- "another one"));
+ rows.add(createMap("id", 1, "desc", "one"));
+ rows.add(createMap("id", 1, "desc", "another one"));
MockDataSource.setIterator(vr.replaceTokens(q), rows.iterator());
EntityProcessor csep = new EntityProcessorWrapper( new CachedSqlEntityProcessor(), null);
csep.init(context);
@@ -62,7 +58,7 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(2, rows.size());
+ assertEquals(2, rows.size());
ds.close();
csep.init(context);
rows = new ArrayList<Map<String, Object>>();
@@ -72,28 +68,27 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(2, rows.size());
- Assert.assertEquals(2, rows.get(0).size());
- Assert.assertEquals(2, rows.get(1).size());
+ assertEquals(2, rows.size());
+ assertEquals(2, rows.get(0).size());
+ assertEquals(2, rows.get(1).size());
}
@Test
public void withoutWhereClauseWithTransformers() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
+ fields.add(createMap("column", "id"));
+ fields.add(createMap("column", "desc"));
String q = "select * from x where id=${x.id}";
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
+ Map<String, String> entityAttrs = createMap(
"query", q, "transformer", UppercaseTransformer.class.getName());
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- vr.addNamespace("x", AbstractDataImportHandlerTestCase.createMap("id", 1));
- Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ vr.addNamespace("x", createMap("id", 1));
+ Context context = getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc", "one"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc",
- "another one"));
+ rows.add(createMap("id", 1, "desc", "one"));
+ rows.add(createMap("id", 1, "desc", "another one"));
MockDataSource.setIterator(vr.replaceTokens(q), rows.iterator());
EntityProcessor csep = new EntityProcessorWrapper( new CachedSqlEntityProcessor(), null);
csep.init(context);
@@ -104,7 +99,7 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(2, rows.size());
+ assertEquals(2, rows.size());
ds.close();
csep.init(context);
rows = new ArrayList<Map<String, Object>>();
@@ -113,30 +108,29 @@ public class TestCachedSqlEntityProcesso
if (r == null)
break;
rows.add(r);
- Assert.assertEquals(r.get("desc").toString().toUpperCase(Locale.ENGLISH), r.get("desc"));
+ assertEquals(r.get("desc").toString().toUpperCase(Locale.ENGLISH), r.get("desc"));
}
- Assert.assertEquals(2, rows.size());
- Assert.assertEquals(2, rows.get(0).size());
- Assert.assertEquals(2, rows.get(1).size());
+ assertEquals(2, rows.size());
+ assertEquals(2, rows.get(0).size());
+ assertEquals(2, rows.get(1).size());
}
@Test
public void withoutWhereClauseWithMultiRowTransformer() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
+ fields.add(createMap("column", "id"));
+ fields.add(createMap("column", "desc"));
String q = "select * from x where id=${x.id}";
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
+ Map<String, String> entityAttrs = createMap(
"query", q, "transformer", DoubleTransformer.class.getName());
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- vr.addNamespace("x", AbstractDataImportHandlerTestCase.createMap("id", 1));
- Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ vr.addNamespace("x", createMap("id", 1));
+ Context context = getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc", "one"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc",
- "another one"));
+ rows.add(createMap("id", 1, "desc", "one"));
+ rows.add(createMap("id", 1, "desc", "another one"));
MockDataSource.setIterator(vr.replaceTokens(q), rows.iterator());
EntityProcessor csep = new EntityProcessorWrapper( new CachedSqlEntityProcessor(), null);
csep.init(context);
@@ -147,7 +141,7 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(4, rows.size());
+ assertEquals(4, rows.size());
ds.close();
csep.init(context);
rows = new ArrayList<Map<String, Object>>();
@@ -157,9 +151,9 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(4, rows.size());
- Assert.assertEquals(2, rows.get(0).size());
- Assert.assertEquals(2, rows.get(1).size());
+ assertEquals(4, rows.size());
+ assertEquals(2, rows.get(0).size());
+ assertEquals(2, rows.get(1).size());
}
public static class DoubleTransformer extends Transformer {
@@ -190,43 +184,42 @@ public class TestCachedSqlEntityProcesso
@Test
public void withWhereClause() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
+ fields.add(createMap("column", "id"));
+ fields.add(createMap("column", "desc"));
String q = "select * from x";
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap(
+ Map<String, String> entityAttrs = createMap(
"query", q, EntityProcessorBase.CACHE_KEY,"id", EntityProcessorBase.CACHE_LOOKUP ,"x.id");
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- Map xNamespace = AbstractDataImportHandlerTestCase.createMap("id", 0);
+ Map xNamespace = createMap("id", 0);
vr.addNamespace("x", xNamespace);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ Context context = getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
doWhereTest(q, context, ds, xNamespace);
}
@Test
public void withKeyAndLookup() {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "id"));
- fields.add(AbstractDataImportHandlerTestCase.createMap("column", "desc"));
+ fields.add(createMap("column", "id"));
+ fields.add(createMap("column", "desc"));
String q = "select * from x";
- Map<String, String> entityAttrs = AbstractDataImportHandlerTestCase.createMap("query", q, "where", "id=x.id");
+ Map<String, String> entityAttrs = createMap("query", q, "where", "id=x.id");
MockDataSource ds = new MockDataSource();
VariableResolverImpl vr = new VariableResolverImpl();
- Map xNamespace = AbstractDataImportHandlerTestCase.createMap("id", 0);
+ Map xNamespace = createMap("id", 0);
vr.addNamespace("x", xNamespace);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
+ Context context = getContext(null, vr, ds, Context.FULL_DUMP, fields, entityAttrs);
doWhereTest(q, context, ds, xNamespace);
}
private void doWhereTest(String q, Context context, MockDataSource ds, Map xNamespace) {
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 1, "desc", "one"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 2, "desc", "two"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 2, "desc",
- "another two"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 3, "desc", "three"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 3, "desc", "another three"));
- rows.add(AbstractDataImportHandlerTestCase.createMap("id", 3, "desc", "another another three"));
+ rows.add(createMap("id", 1, "desc", "one"));
+ rows.add(createMap("id", 2, "desc", "two"));
+ rows.add(createMap("id", 2, "desc", "another two"));
+ rows.add(createMap("id", 3, "desc", "three"));
+ rows.add(createMap("id", 3, "desc", "another three"));
+ rows.add(createMap("id", 3, "desc", "another another three"));
MockDataSource.setIterator(q, rows.iterator());
EntityProcessor csep = new EntityProcessorWrapper(new CachedSqlEntityProcessor(), null);
csep.init(context);
@@ -237,7 +230,7 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(0, rows.size());
+ assertEquals(0, rows.size());
ds.close();
csep.init(context);
@@ -249,7 +242,7 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(2, rows.size());
+ assertEquals(2, rows.size());
csep.init(context);
rows = new ArrayList<Map<String, Object>>();
@@ -260,6 +253,6 @@ public class TestCachedSqlEntityProcesso
break;
rows.add(r);
}
- Assert.assertEquals(3, rows.size());
+ assertEquals(3, rows.size());
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestClobTransformer.java Wed Oct 13 16:17:05 2010
@@ -16,9 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.Assert;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.junit.Test;
import java.io.StringReader;
@@ -35,7 +32,7 @@ import java.util.*;
* @see org.apache.solr.handler.dataimport.ClobTransformer
* @since solr 1.4
*/
-public class TestClobTransformer extends SolrTestCaseJ4 {
+public class TestClobTransformer extends AbstractDataImportHandlerTestCase {
@Test
public void simple() throws Exception {
List<Map<String, String>> flds = new ArrayList<Map<String, String>>();
@@ -45,7 +42,7 @@ public class TestClobTransformer extends
f.put(ClobTransformer.CLOB, "true");
f.put(DataImporter.NAME, "description");
flds.add(f);
- Context ctx = AbstractDataImportHandlerTestCase.getContext(null, new VariableResolverImpl(), null, Context.FULL_DUMP, flds, Collections.EMPTY_MAP);
+ Context ctx = getContext(null, new VariableResolverImpl(), null, Context.FULL_DUMP, flds, Collections.EMPTY_MAP);
Transformer t = new ClobTransformer();
Map<String, Object> row = new HashMap<String, Object>();
Clob clob = (Clob) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[]{Clob.class}, new InvocationHandler() {
@@ -59,6 +56,6 @@ public class TestClobTransformer extends
row.put("dsc", clob);
t.transformRow(row, ctx);
- Assert.assertEquals("hello!", row.get("dsc"));
+ assertEquals("hello!", row.get("dsc"));
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Wed Oct 13 16:17:05 2010
@@ -16,9 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -26,11 +24,10 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.util.AbstractSolrTestCase;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
import java.io.File;
import java.util.List;
@@ -41,7 +38,7 @@ import java.util.List;
* @version $Id$
* @since solr 1.4
*/
-public class TestContentStreamDataSource extends SolrTestCaseJ4 {
+public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCase {
private static final String CONF_DIR = "." + File.separator + "solr" + File.separator + "conf" + File.separator;
SolrInstance instance = null;
JettySolrRunner jetty;
@@ -119,7 +116,7 @@ public class TestContentStreamDataSource
public void setUp() throws Exception {
- File home = new File(SolrTestCaseJ4.TEMP_DIR,
+ File home = new File(TEMP_DIR,
getClass().getName() + "-" + System.currentTimeMillis());
@@ -141,7 +138,7 @@ public class TestContentStreamDataSource
}
public void tearDown() throws Exception {
- AbstractSolrTestCase.recurseDelete(homeDir);
+ recurseDelete(homeDir);
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java Wed Oct 13 16:17:05 2010
@@ -16,7 +16,7 @@
*/
package org.apache.solr.handler.dataimport;
-import junit.framework.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Document;
@@ -34,25 +34,9 @@ import java.util.List;
* @since solr 1.3
*/
public class TestDataConfig extends AbstractDataImportHandlerTestCase {
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-nodatasource-solrconfig.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-nodatasource-solrconfig.xml", "dataimport-schema.xml");
}
@Test
@@ -62,20 +46,20 @@ public class TestDataConfig extends Abst
rows.add(createMap("id", "1", "desc", "one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(loadDataConfig("data-config-with-datasource.xml"));
+ runFullImport(loadDataConfig("data-config-with-datasource.xml"));
assertQ(req("id:1"), "//*[@numFound='1']");
}
@Test
- public void basic() throws Exception {
+ public void testBasic() throws Exception {
javax.xml.parsers.DocumentBuilder builder = DocumentBuilderFactory
.newInstance().newDocumentBuilder();
Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
DataConfig dc = new DataConfig();
dc.readFromXml(doc.getDocumentElement());
- Assert.assertEquals("atrimlisting", dc.document.entities.get(0).name);
+ assertEquals("atrimlisting", dc.document.entities.get(0).name);
}
private static final String xml = "<dataConfig>\n"
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDateFormatTransformer.java Wed Oct 13 16:17:05 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.SimpleDateFormat;
@@ -31,40 +29,37 @@ import java.util.*;
* @version $Id$
* @since solr 1.3
*/
-public class TestDateFormatTransformer extends SolrTestCaseJ4 {
+public class TestDateFormatTransformer extends AbstractDataImportHandlerTestCase {
@Test
@SuppressWarnings("unchecked")
public void testTransformRow_SingleRow() throws Exception {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
- "lastModified"));
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
+ fields.add(createMap(DataImporter.COLUMN, "lastModified"));
+ fields.add(createMap(DataImporter.COLUMN,
"dateAdded", RegexTransformer.SRC_COL_NAME, "lastModified",
DateFormatTransformer.DATE_TIME_FMT, "MM/dd/yyyy"));
SimpleDateFormat format = new SimpleDateFormat("MM/dd/yyyy");
Date now = format.parse(format.format(new Date()));
- Map row = AbstractDataImportHandlerTestCase.createMap("lastModified", format
- .format(now));
+ Map row = createMap("lastModified", format.format(now));
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver,
+ Context context = getContext(null, resolver,
null, Context.FULL_DUMP, fields, null);
new DateFormatTransformer().transformRow(row, context);
- Assert.assertEquals(now, row.get("dateAdded"));
+ assertEquals(now, row.get("dateAdded"));
}
@Test
@SuppressWarnings("unchecked")
public void testTransformRow_MultipleRows() throws Exception {
List fields = new ArrayList();
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
- "lastModified"));
- fields.add(AbstractDataImportHandlerTestCase.createMap(DataImporter.COLUMN,
+ fields.add(createMap(DataImporter.COLUMN, "lastModified"));
+ fields.add(createMap(DataImporter.COLUMN,
"dateAdded", RegexTransformer.SRC_COL_NAME, "lastModified",
DateFormatTransformer.DATE_TIME_FMT, "MM/dd/yyyy hh:mm:ss.SSS"));
@@ -81,13 +76,13 @@ public class TestDateFormatTransformer e
VariableResolverImpl resolver = new VariableResolverImpl();
resolver.addNamespace("e", row);
- Context context = AbstractDataImportHandlerTestCase.getContext(null, resolver,
+ Context context = getContext(null, resolver,
null, Context.FULL_DUMP, fields, null);
new DateFormatTransformer().transformRow(row, context);
List output = new ArrayList();
output.add(now1);
output.add(now2);
- Assert.assertEquals(output, row.get("dateAdded"));
+ assertEquals(output, row.get("dateAdded"));
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java Wed Oct 13 16:17:05 2010
@@ -16,10 +16,9 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrInputDocument;
-import static org.apache.solr.handler.dataimport.AbstractDataImportHandlerTestCase.createMap;
-import org.junit.Assert;
+
+import org.junit.After;
import org.junit.Test;
import java.util.*;
@@ -32,183 +31,155 @@ import java.util.*;
* @version $Id$
* @since solr 1.3
*/
-public class TestDocBuilder extends SolrTestCaseJ4 {
+public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
+ @After
+ public void tearDown() throws Exception {
+ MockDataSource.clearCache();
+ super.tearDown();
+ }
+
@Test
public void loadClass() throws Exception {
Class clz = DocBuilder.loadClass("RegexTransformer", null);
- Assert.assertNotNull(clz);
+ assertNotNull(clz);
}
@Test
public void singleEntityNoRows() {
- try {
- DataImporter di = new DataImporter();
- di.loadAndInit(dc_singleEntity);
- DataConfig cfg = di.getConfig();
- DataConfig.Entity ent = cfg.document.entities.get(0);
- MockDataSource.setIterator("select * from x", new ArrayList().iterator());
- ent.dataSrc = new MockDataSource();
- ent.isDocRoot = true;
- DataImporter.RequestParams rp = new DataImporter.RequestParams();
- rp.command = "full-import";
- SolrWriterImpl swi = new SolrWriterImpl();
- di.runCmd(rp, swi);
- Assert.assertEquals(Boolean.TRUE, swi.deleteAllCalled);
- Assert.assertEquals(Boolean.TRUE, swi.commitCalled);
- Assert.assertEquals(0, swi.docs.size());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.queryCount
- .get());
- Assert
- .assertEquals(0, di.getDocBuilder().importStatistics.docCount.get());
- Assert.assertEquals(0, di.getDocBuilder().importStatistics.rowsCount
- .get());
- } finally {
- MockDataSource.clearCache();
- }
+ DataImporter di = new DataImporter();
+ di.loadAndInit(dc_singleEntity);
+ DataConfig cfg = di.getConfig();
+ DataConfig.Entity ent = cfg.document.entities.get(0);
+ MockDataSource.setIterator("select * from x", new ArrayList().iterator());
+ ent.dataSrc = new MockDataSource();
+ ent.isDocRoot = true;
+ DataImporter.RequestParams rp = new DataImporter.RequestParams();
+ rp.command = "full-import";
+ SolrWriterImpl swi = new SolrWriterImpl();
+ di.runCmd(rp, swi);
+ assertEquals(Boolean.TRUE, swi.deleteAllCalled);
+ assertEquals(Boolean.TRUE, swi.commitCalled);
+ assertEquals(0, swi.docs.size());
+ assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
+ assertEquals(0, di.getDocBuilder().importStatistics.docCount.get());
+ assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
@Test
public void testDeltaImportNoRows_MustNotCommit() {
- try {
- DataImporter di = new DataImporter();
- di.loadAndInit(dc_deltaConfig);
- DataConfig cfg = di.getConfig();
- DataConfig.Entity ent = cfg.document.entities.get(0);
- MockDataSource.setIterator("select * from x", new ArrayList().iterator());
- MockDataSource.setIterator("select id from x", new ArrayList().iterator());
- ent.dataSrc = new MockDataSource();
- ent.isDocRoot = true;
- DataImporter.RequestParams rp = new DataImporter.RequestParams(createMap("command", "delta-import"));
- SolrWriterImpl swi = new SolrWriterImpl();
- di.runCmd(rp, swi);
- Assert.assertEquals(Boolean.FALSE, swi.deleteAllCalled);
- Assert.assertEquals(Boolean.FALSE, swi.commitCalled);
- Assert.assertEquals(0, swi.docs.size());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
- Assert.assertEquals(0, di.getDocBuilder().importStatistics.docCount.get());
- Assert.assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
- } finally {
- MockDataSource.clearCache();
- }
+ DataImporter di = new DataImporter();
+ di.loadAndInit(dc_deltaConfig);
+ DataConfig cfg = di.getConfig();
+ DataConfig.Entity ent = cfg.document.entities.get(0);
+ MockDataSource.setIterator("select * from x", new ArrayList().iterator());
+ MockDataSource.setIterator("select id from x", new ArrayList().iterator());
+ ent.dataSrc = new MockDataSource();
+ ent.isDocRoot = true;
+ DataImporter.RequestParams rp = new DataImporter.RequestParams(createMap("command", "delta-import"));
+ SolrWriterImpl swi = new SolrWriterImpl();
+ di.runCmd(rp, swi);
+ assertEquals(Boolean.FALSE, swi.deleteAllCalled);
+ assertEquals(Boolean.FALSE, swi.commitCalled);
+ assertEquals(0, swi.docs.size());
+ assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
+ assertEquals(0, di.getDocBuilder().importStatistics.docCount.get());
+ assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
@Test
public void singleEntityOneRow() {
- try {
- DataImporter di = new DataImporter();
- di.loadAndInit(dc_singleEntity);
- DataConfig cfg = di.getConfig();
- DataConfig.Entity ent = cfg.document.entities.get(0);
- List l = new ArrayList();
- l.add(createMap("id", 1, "desc", "one"));
- MockDataSource.setIterator("select * from x", l.iterator());
- ent.dataSrc = new MockDataSource();
- ent.isDocRoot = true;
- DataImporter.RequestParams rp = new DataImporter.RequestParams();
- rp.command = "full-import";
- SolrWriterImpl swi = new SolrWriterImpl();
- di.runCmd(rp, swi);
- Assert.assertEquals(Boolean.TRUE, swi.deleteAllCalled);
- Assert.assertEquals(Boolean.TRUE, swi.commitCalled);
- Assert.assertEquals(1, swi.docs.size());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.queryCount
- .get());
- Assert
- .assertEquals(1, di.getDocBuilder().importStatistics.docCount.get());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.rowsCount
- .get());
-
- for (int i = 0; i < l.size(); i++) {
- Map<String, Object> map = (Map<String, Object>) l.get(i);
- SolrInputDocument doc = swi.docs.get(i);
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- Assert.assertEquals(entry.getValue(), doc.getFieldValue(entry
- .getKey()));
- }
+ DataImporter di = new DataImporter();
+ di.loadAndInit(dc_singleEntity);
+ DataConfig cfg = di.getConfig();
+ DataConfig.Entity ent = cfg.document.entities.get(0);
+ List l = new ArrayList();
+ l.add(createMap("id", 1, "desc", "one"));
+ MockDataSource.setIterator("select * from x", l.iterator());
+ ent.dataSrc = new MockDataSource();
+ ent.isDocRoot = true;
+ DataImporter.RequestParams rp = new DataImporter.RequestParams();
+ rp.command = "full-import";
+ SolrWriterImpl swi = new SolrWriterImpl();
+ di.runCmd(rp, swi);
+ assertEquals(Boolean.TRUE, swi.deleteAllCalled);
+ assertEquals(Boolean.TRUE, swi.commitCalled);
+ assertEquals(1, swi.docs.size());
+ assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
+ assertEquals(1, di.getDocBuilder().importStatistics.docCount.get());
+ assertEquals(1, di.getDocBuilder().importStatistics.rowsCount.get());
+
+ for (int i = 0; i < l.size(); i++) {
+ Map<String, Object> map = (Map<String, Object>) l.get(i);
+ SolrInputDocument doc = swi.docs.get(i);
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ assertEquals(entry.getValue(), doc.getFieldValue(entry.getKey()));
}
- } finally {
- MockDataSource.clearCache();
}
}
@Test
public void testImportCommand() {
- try {
- DataImporter di = new DataImporter();
- di.loadAndInit(dc_singleEntity);
- DataConfig cfg = di.getConfig();
- DataConfig.Entity ent = cfg.document.entities.get(0);
- List l = new ArrayList();
- l.add(createMap("id", 1, "desc", "one"));
- MockDataSource.setIterator("select * from x", l.iterator());
- ent.dataSrc = new MockDataSource();
- ent.isDocRoot = true;
- DataImporter.RequestParams rp = new DataImporter.RequestParams(createMap("command", "import"));
- SolrWriterImpl swi = new SolrWriterImpl();
- di.runCmd(rp, swi);
- Assert.assertEquals(Boolean.FALSE, swi.deleteAllCalled);
- Assert.assertEquals(Boolean.TRUE, swi.commitCalled);
- Assert.assertEquals(1, swi.docs.size());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.queryCount
- .get());
- Assert
- .assertEquals(1, di.getDocBuilder().importStatistics.docCount.get());
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.rowsCount
- .get());
-
- for (int i = 0; i < l.size(); i++) {
- Map<String, Object> map = (Map<String, Object>) l.get(i);
- SolrInputDocument doc = swi.docs.get(i);
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- Assert.assertEquals(entry.getValue(), doc.getFieldValue(entry
- .getKey()));
- }
+ DataImporter di = new DataImporter();
+ di.loadAndInit(dc_singleEntity);
+ DataConfig cfg = di.getConfig();
+ DataConfig.Entity ent = cfg.document.entities.get(0);
+ List l = new ArrayList();
+ l.add(createMap("id", 1, "desc", "one"));
+ MockDataSource.setIterator("select * from x", l.iterator());
+ ent.dataSrc = new MockDataSource();
+ ent.isDocRoot = true;
+ DataImporter.RequestParams rp = new DataImporter.RequestParams(createMap("command", "import"));
+ SolrWriterImpl swi = new SolrWriterImpl();
+ di.runCmd(rp, swi);
+ assertEquals(Boolean.FALSE, swi.deleteAllCalled);
+ assertEquals(Boolean.TRUE, swi.commitCalled);
+ assertEquals(1, swi.docs.size());
+ assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
+ assertEquals(1, di.getDocBuilder().importStatistics.docCount.get());
+ assertEquals(1, di.getDocBuilder().importStatistics.rowsCount.get());
+
+ for (int i = 0; i < l.size(); i++) {
+ Map<String, Object> map = (Map<String, Object>) l.get(i);
+ SolrInputDocument doc = swi.docs.get(i);
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ assertEquals(entry.getValue(), doc.getFieldValue(entry.getKey()));
}
- } finally {
- MockDataSource.clearCache();
}
}
@Test
public void singleEntityMultipleRows() {
- try {
- DataImporter di = new DataImporter();
- di.loadAndInit(dc_singleEntity);
- DataConfig cfg = di.getConfig();
- DataConfig.Entity ent = cfg.document.entities.get(0);
- ent.isDocRoot = true;
- DataImporter.RequestParams rp = new DataImporter.RequestParams();
- rp.command = "full-import";
- List l = new ArrayList();
- l.add(createMap("id", 1, "desc", "one"));
- l.add(createMap("id", 2, "desc", "two"));
- l.add(createMap("id", 3, "desc", "three"));
-
- MockDataSource.setIterator("select * from x", l.iterator());
- ent.dataSrc = new MockDataSource();
- SolrWriterImpl swi = new SolrWriterImpl();
- di.runCmd(rp, swi);
- Assert.assertEquals(Boolean.TRUE, swi.deleteAllCalled);
- Assert.assertEquals(Boolean.TRUE, swi.commitCalled);
- Assert.assertEquals(3, swi.docs.size());
- for (int i = 0; i < l.size(); i++) {
- Map<String, Object> map = (Map<String, Object>) l.get(i);
- SolrInputDocument doc = swi.docs.get(i);
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- Assert.assertEquals(entry.getValue(), doc.getFieldValue(entry.getKey()));
- }
- Assert.assertEquals(map.get("desc"), doc.getFieldValue("desc_s"));
+ DataImporter di = new DataImporter();
+ di.loadAndInit(dc_singleEntity);
+ DataConfig cfg = di.getConfig();
+ DataConfig.Entity ent = cfg.document.entities.get(0);
+ ent.isDocRoot = true;
+ DataImporter.RequestParams rp = new DataImporter.RequestParams();
+ rp.command = "full-import";
+ List l = new ArrayList();
+ l.add(createMap("id", 1, "desc", "one"));
+ l.add(createMap("id", 2, "desc", "two"));
+ l.add(createMap("id", 3, "desc", "three"));
+
+ MockDataSource.setIterator("select * from x", l.iterator());
+ ent.dataSrc = new MockDataSource();
+ SolrWriterImpl swi = new SolrWriterImpl();
+ di.runCmd(rp, swi);
+ assertEquals(Boolean.TRUE, swi.deleteAllCalled);
+ assertEquals(Boolean.TRUE, swi.commitCalled);
+ assertEquals(3, swi.docs.size());
+ for (int i = 0; i < l.size(); i++) {
+ Map<String, Object> map = (Map<String, Object>) l.get(i);
+ SolrInputDocument doc = swi.docs.get(i);
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ assertEquals(entry.getValue(), doc.getFieldValue(entry.getKey()));
}
- Assert.assertEquals(1, di.getDocBuilder().importStatistics.queryCount
- .get());
- Assert
- .assertEquals(3, di.getDocBuilder().importStatistics.docCount.get());
- Assert.assertEquals(3, di.getDocBuilder().importStatistics.rowsCount
- .get());
- } finally {
- MockDataSource.clearCache();
+ assertEquals(map.get("desc"), doc.getFieldValue("desc_s"));
}
+ assertEquals(1, di.getDocBuilder().importStatistics.queryCount.get());
+ assertEquals(3, di.getDocBuilder().importStatistics.docCount.get());
+ assertEquals(3, di.getDocBuilder().importStatistics.rowsCount.get());
}
static class SolrWriterImpl extends SolrWriter {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java Wed Oct 13 16:17:05 2010
@@ -16,16 +16,14 @@
*/
package org.apache.solr.handler.dataimport;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.Assert;
+
import org.apache.solr.request.LocalSolrQueryRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Date;
import java.io.File;
/**
@@ -38,24 +36,9 @@ import java.io.File;
*/
public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
}
@Test
@@ -65,7 +48,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "1", "desc", "one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(loadDataConfig("single-entity-data-config.xml"));
+ runFullImport(loadDataConfig("single-entity-data-config.xml"));
assertQ(req("id:1"), "//*[@numFound='1']");
}
@@ -77,7 +60,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "1", "desC", "one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigWithCaseInsensitiveFields);
+ runFullImport(dataConfigWithCaseInsensitiveFields);
assertQ(req("id:1"), "//*[@numFound='1']");
assertTrue("Start event listener was not called", StartEventListener.executed);
@@ -91,7 +74,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "1", "desc", "one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigWithDynamicTransformer);
+ runFullImport(dataConfigWithDynamicTransformer);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("dynamic_s:test"), "//*[@numFound='1']");
@@ -134,7 +117,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "1", "desc", "one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(loadDataConfig("data-config-with-transformer.xml"));
+ runFullImport(loadDataConfig("data-config-with-transformer.xml"));
}
@Test
@@ -145,7 +128,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "2", "desc", "two", "$skipDoc", "true"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigWithDynamicTransformer);
+ runFullImport(dataConfigWithDynamicTransformer);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='0']");
@@ -159,7 +142,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "2", "desc", "two", "$skipRow", "true"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigWithDynamicTransformer);
+ runFullImport(dataConfigWithDynamicTransformer);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='0']");
@@ -179,7 +162,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("name_s", "xyz", "$skipRow", "true"));
MockDataSource.setIterator("4", rows.iterator());
- super.runFullImport(dataConfigWithTwoEntities);
+ runFullImport(dataConfigWithTwoEntities);
assertQ(req("id:3"), "//*[@numFound='1']");
assertQ(req("id:4"), "//*[@numFound='1']");
assertQ(req("name_s:abcd"), "//*[@numFound='1']");
@@ -194,7 +177,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "2", "desc", "two", "$stopTransform", "true"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigForSkipTransform);
+ runFullImport(dataConfigForSkipTransform);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='1']");
@@ -210,7 +193,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "3", "desc", "two", "$deleteDocById", "2"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigForSkipTransform);
+ runFullImport(dataConfigForSkipTransform);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='0']");
@@ -223,7 +206,7 @@ public class TestDocBuilder2 extends Abs
rows.add(createMap("id", "3", "desc", "two", "$deleteDocByQuery", "desc:one"));
MockDataSource.setIterator("select * from x", rows.iterator());
- super.runFullImport(dataConfigForSkipTransform);
+ runFullImport(dataConfigForSkipTransform);
assertQ(req("id:1"), "//*[@numFound='0']");
assertQ(req("id:2"), "//*[@numFound='0']");
@@ -239,15 +222,15 @@ public class TestDocBuilder2 extends Abs
Map<String, String> params = createMap("baseDir", tmpdir.getAbsolutePath());
- TestFileListEntityProcessor.createFile(tmpdir, "a.xml", "a.xml".getBytes(), true);
- TestFileListEntityProcessor.createFile(tmpdir, "b.xml", "b.xml".getBytes(), true);
- TestFileListEntityProcessor.createFile(tmpdir, "c.props", "c.props".getBytes(), true);
- super.runFullImport(dataConfigFileList, params);
+ createFile(tmpdir, "a.xml", "a.xml".getBytes(), true);
+ createFile(tmpdir, "b.xml", "b.xml".getBytes(), true);
+ createFile(tmpdir, "c.props", "c.props".getBytes(), true);
+ runFullImport(dataConfigFileList, params);
assertQ(req("*:*"), "//*[@numFound='3']");
// Add a new file after a full index is done
- TestFileListEntityProcessor.createFile(tmpdir, "t.xml", "t.xml".getBytes(), false);
- super.runFullImport(dataConfigFileList, params);
+ createFile(tmpdir, "t.xml", "t.xml".getBytes(), false);
+ runFullImport(dataConfigFileList, params);
// we should find only 1 because by default clean=true is passed
// and this particular import should find only one file t.xml
assertQ(req("*:*"), "//*[@numFound='1']");
@@ -255,7 +238,7 @@ public class TestDocBuilder2 extends Abs
public static class MockTransformer extends Transformer {
public Object transformRow(Map<String, Object> row, Context context) {
- Assert.assertTrue("Context gave incorrect data source", context.getDataSource("mockDs") instanceof MockDataSource2);
+ assertTrue("Context gave incorrect data source", context.getDataSource("mockDs") instanceof MockDataSource2);
return row;
}
}
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java Wed Oct 13 16:17:05 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,7 +31,7 @@ import java.util.Map;
* @version $Id$
* @since solr 1.3
*/
-public class TestEntityProcessorBase extends SolrTestCaseJ4 {
+public class TestEntityProcessorBase extends AbstractDataImportHandlerTestCase {
@Test
public void multiTransformer() {
@@ -41,10 +39,10 @@ public class TestEntityProcessorBase ext
Map<String, String> entity = new HashMap<String, String>();
entity.put("transformer", T1.class.getName() + "," + T2.class.getName()
+ "," + T3.class.getName());
- fields.add(TestRegexTransformer.getField("A", null, null, null, null));
- fields.add(TestRegexTransformer.getField("B", null, null, null, null));
+ fields.add(getField("A", null, null, null, null));
+ fields.add(getField("B", null, null, null, null));
- Context context = AbstractDataImportHandlerTestCase.getContext(null, null, new MockDataSource(), Context.FULL_DUMP,
+ Context context = getContext(null, null, new MockDataSource(), Context.FULL_DUMP,
fields, entity);
Map<String, Object> src = new HashMap<String, Object>();
src.put("A", "NA");
@@ -52,9 +50,9 @@ public class TestEntityProcessorBase ext
EntityProcessorWrapper sep = new EntityProcessorWrapper(new SqlEntityProcessor(), null);
sep.init(context);
Map<String, Object> res = sep.applyTransformer(src);
- Assert.assertNotNull(res.get("T1"));
- Assert.assertNotNull(res.get("T2"));
- Assert.assertNotNull(res.get("T3"));
+ assertNotNull(res.get("T1"));
+ assertNotNull(res.get("T2"));
+ assertNotNull(res.get("T3"));
}
static class T1 extends Transformer {
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java Wed Oct 13 16:17:05 2010
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
/**
* Tests exception handling during imports in DataImportHandler
*
@@ -31,23 +34,35 @@ import java.util.Properties;
*/
public class TestErrorHandling extends AbstractDataImportHandlerTestCase {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("dataimport-solrconfig.xml", "dataimport-schema.xml");
+ }
+
+ @Before @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ clearIndex();
+ assertU(commit());
+ }
+
public void testMalformedStreamingXml() throws Exception {
StringDataSource.xml = malformedXml;
- super.runFullImport(dataConfigWithStreaming);
+ runFullImport(dataConfigWithStreaming);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='1']");
}
public void testMalformedNonStreamingXml() throws Exception {
StringDataSource.xml = malformedXml;
- super.runFullImport(dataConfigWithoutStreaming);
+ runFullImport(dataConfigWithoutStreaming);
assertQ(req("id:1"), "//*[@numFound='1']");
assertQ(req("id:2"), "//*[@numFound='1']");
}
public void testAbortOnError() throws Exception {
StringDataSource.xml = malformedXml;
- super.runFullImport(dataConfigAbortOnError);
+ runFullImport(dataConfigAbortOnError);
assertQ(req("*:*"), "//*[@numFound='0']");
}
@@ -56,30 +71,10 @@ public class TestErrorHandling extends A
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
rows.add(createMap("id", "3", "desc", "exception-transformer"));
MockDataSource.setIterator("select * from foo", rows.iterator());
- super.runFullImport(dataConfigWithTransformer);
+ runFullImport(dataConfigWithTransformer);
assertQ(req("*:*"), "//*[@numFound='3']");
}
- @Override
- public String getSchemaFile() {
- return "dataimport-schema.xml";
- }
-
- @Override
- public String getSolrConfigFile() {
- return "dataimport-solrconfig.xml";
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
public static class StringDataSource extends DataSource<Reader> {
public static String xml = "";
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java Wed Oct 13 16:17:05 2010
@@ -16,9 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import static org.junit.Assert.assertEquals;
-
-import org.apache.solr.SolrTestCaseJ4;
import org.junit.Before;
import org.junit.Test;
@@ -26,15 +23,13 @@ import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
-import junit.framework.Assert;
-
/**
* <p> Test for EvaluatorBag </p>
*
* @version $Id$
* @since solr 1.3
*/
-public class TestEvaluatorBag extends SolrTestCaseJ4 {
+public class TestEvaluatorBag extends AbstractDataImportHandlerTestCase {
private static final String ENCODING = "UTF-8";
VariableResolverImpl resolver;
@@ -91,10 +86,10 @@ public class TestEvaluatorBag extends So
VariableResolverImpl vr = new VariableResolverImpl();
vr.addNamespace("a",m);
List l = EvaluatorBag.parseParams(" 1 , a.b, 'hello!', 'ds,o,u\'za',",vr);
- Assert.assertEquals(new Double(1),l.get(0));
- Assert.assertEquals("B",((EvaluatorBag.VariableWrapper)l.get(1)).resolve());
- Assert.assertEquals("hello!",l.get(2));
- Assert.assertEquals("ds,o,u'za",l.get(3));
+ assertEquals(new Double(1),l.get(0));
+ assertEquals("B",((EvaluatorBag.VariableWrapper)l.get(1)).resolve());
+ assertEquals("hello!",l.get(2));
+ assertEquals("ds,o,u'za",l.get(3));
}
@Test
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java?rev=1022170&r1=1022169&r2=1022170&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFieldReader.java Wed Oct 13 16:17:05 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.util.ArrayList;
@@ -33,7 +29,7 @@ import java.util.Map;
* @see org.apache.solr.handler.dataimport.FieldReaderDataSource
* @since 1.4
*/
-public class TestFieldReader extends SolrTestCaseJ4 {
+public class TestFieldReader extends AbstractDataImportHandlerTestCase {
@Test
public void simple() {
@@ -45,7 +41,7 @@ public class TestFieldReader extends Sol
l.add(createMap("xml", xml));
MockDataSource.setIterator("select * from a", l.iterator());
di.runCmd(rp, sw);
- Assert.assertEquals(sw.docs.get(0).getFieldValue("y"), "Hello");
+ assertEquals(sw.docs.get(0).getFieldValue("y"), "Hello");
MockDataSource.clearCache();
}