Menu
▾
▴
[Clucene-cvs] SF.net SVN: clucene:[2957] branches/lucene2_3_2/src/test
|
From: <ust...@us...> - 2009-03-29 08:44:17
|
Revision: 2957
http://clucene.svn.sourceforge.net/clucene/?rev=2957&view=rev
Author: ustramooner
Date: 2009-03-29 08:44:13 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
fix for bug 1948533
Modified Paths:
--------------
branches/lucene2_3_2/src/test/CuTest.cpp
branches/lucene2_3_2/src/test/analysis/TestAnalysis.cpp
branches/lucene2_3_2/src/test/index/TestHighFreqTerms.cpp
branches/lucene2_3_2/src/test/index/TestReuters.cpp
branches/lucene2_3_2/src/test/search/TestSearch.cpp
branches/lucene2_3_2/src/test/search/TestTermVector.cpp
branches/lucene2_3_2/src/test/store/TestStore.cpp
branches/lucene2_3_2/src/test/util/TestPriorityQueue.cpp
Modified: branches/lucene2_3_2/src/test/CuTest.cpp
===================================================================
--- branches/lucene2_3_2/src/test/CuTest.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/CuTest.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -377,7 +377,7 @@
int bufferLen = 25-summary->length-10;
for (int i=0;i<bufferLen;i++ )
CuStringAppend(summary,_T(" "));
- CuStringAppendFormat(summary,_T(" - %dms"),testSuite->timeTaken);
+ CuStringAppendFormat(summary,_T(" - %dms"), (int32_t)testSuite->timeTaken);
}
CuStringAppend(summary, _T("\n"));
}
Modified: branches/lucene2_3_2/src/test/analysis/TestAnalysis.cpp
===================================================================
--- branches/lucene2_3_2/src/test/analysis/TestAnalysis.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/analysis/TestAnalysis.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -24,7 +24,7 @@
uint64_t end = Misc::currentTimeMillis();
int64_t time = end - start;
- CuMessageA (tc,"%d milliseconds to extract ",time);
+ CuMessageA (tc,"%d milliseconds to extract ", (int32_t)time);
CuMessageA (tc,"%d tokens\n", count);
CuMessageA (tc,"%f microseconds/token\n",(time*1000.0)/count );
CuMessageA (tc,"%f megabytes/hour\n", (bytes * 1000.0 * 60.0 * 60.0)/(time * 1000000.0) );
Modified: branches/lucene2_3_2/src/test/index/TestHighFreqTerms.cpp
===================================================================
--- branches/lucene2_3_2/src/test/index/TestHighFreqTerms.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/index/TestHighFreqTerms.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -66,7 +66,7 @@
reader->close();
_CLDELETE( reader );
- //CuMessageA(tc,"%d milliseconds\n",Misc::currentTimeMillis()-start);;
+ //CuMessageA(tc,"%d milliseconds\n",(int32_t)(Misc::currentTimeMillis()-start));
}
void TestHighFreqTerms(CuTest *tc){
char loc[1024];
Modified: branches/lucene2_3_2/src/test/index/TestReuters.cpp
===================================================================
--- branches/lucene2_3_2/src/test/index/TestReuters.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/index/TestReuters.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -181,7 +181,7 @@
diff *= -1;
if ( diff > 16 ){
TCHAR tmp[1024];
- _sntprintf(tmp,1024,_T("Norms are off by more than the threshold! %d, should be %d"), norms2[i], norms1[i]);
+ _sntprintf(tmp,1024,_T("Norms are off by more than the threshold! %d, should be %d"), (int32_t)norms2[i], (int32_t)norms1[i]);
CuAssert(tc,tmp,false);
}
}
Modified: branches/lucene2_3_2/src/test/search/TestSearch.cpp
===================================================================
--- branches/lucene2_3_2/src/test/search/TestSearch.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/search/TestSearch.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -285,7 +285,7 @@
ram->close();
_CLDECDELETE(ram);
- CuMessageA (tc,"took %d milliseconds\n", Misc::currentTimeMillis()-start);
+ CuMessageA (tc,"took %d milliseconds\n", (int32_t)(Misc::currentTimeMillis()-start));
}
void testNormEncoding(CuTest *tc) {
Modified: branches/lucene2_3_2/src/test/search/TestTermVector.cpp
===================================================================
--- branches/lucene2_3_2/src/test/search/TestTermVector.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/search/TestTermVector.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -187,7 +187,7 @@
//float_t coord = sim.coord()
//System.out.println("TF: " + tf + " IDF: " + idf + " LenNorm: " + lNorm);
const TCHAR** vTerms = vector->getTerms();
- const Array<int32_t>* freqs = vector->getTermFrequencies();
+ const ValueArray<int32_t>* freqs = vector->getTermFrequencies();
int32_t i=0;
while ( vTerms && vTerms[i] != NULL )
{
@@ -225,7 +225,7 @@
CLUCENE_ASSERT(vector != NULL);
//_tprintf(_T("Vector: %s\n"),vector);
const TCHAR** terms = vector->getTerms();
- const Array<int32_t>* freqs = vector->getTermFrequencies();
+ const ValueArray<int32_t>* freqs = vector->getTermFrequencies();
CLUCENE_ASSERT(terms != NULL);
int termsLength = 0;
Modified: branches/lucene2_3_2/src/test/store/TestStore.cpp
===================================================================
--- branches/lucene2_3_2/src/test/store/TestStore.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/store/TestStore.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -54,7 +54,7 @@
file->close();
_CLDELETE(file);
}
- CuMessageA(tc, "%d total milliseconds to create\n", Misc::currentTimeMillis() - start);
+ CuMessageA(tc, "%d total milliseconds to create\n", (int32_t)(Misc::currentTimeMillis() - start));
if (!ram){
store->close();
@@ -85,7 +85,7 @@
_CLDELETE(file);
}
- CuMessageA(tc,"%d total milliseconds to read\n", Misc::currentTimeMillis() - start);
+ CuMessageA(tc,"%d total milliseconds to read\n", (int32_t)(Misc::currentTimeMillis() - start));
srand(1251971);
start = Misc::currentTimeMillis();
@@ -95,8 +95,8 @@
store->deleteFile(name);
}
- CuMessageA(tc, "%d total milliseconds to delete\n",Misc::currentTimeMillis() - start);
- CuMessageA(tc, "%d total milliseconds \n", Misc::currentTimeMillis() - veryStart);
+ CuMessageA(tc, "%d total milliseconds to delete\n",(int32_t)(Misc::currentTimeMillis() - start));
+ CuMessageA(tc, "%d total milliseconds \n", (int32_t)(Misc::currentTimeMillis() - veryStart));
//test makeLock::toString
CL_NS(store)::LuceneLock* lf = store->makeLock("testlock");
Modified: branches/lucene2_3_2/src/test/util/TestPriorityQueue.cpp
===================================================================
--- branches/lucene2_3_2/src/test/util/TestPriorityQueue.cpp 2009-03-29 08:30:19 UTC (rev 2956)
+++ branches/lucene2_3_2/src/test/util/TestPriorityQueue.cpp 2009-03-29 08:44:13 UTC (rev 2957)
@@ -33,7 +33,7 @@
sum += next;
pq.put( next );
}
- CuMessageA(tc,"%d milliseconds/",CL_NS(util)::Misc::currentTimeMillis()-start);
+ CuMessageA(tc,"%d milliseconds/", (int32_t)(CL_NS(util)::Misc::currentTimeMillis()-start));
CuMessageA(tc,"%d puts\n",count);
start = CL_NS(util)::Misc::currentTimeMillis();
@@ -50,7 +50,7 @@
sum2 += last;
}
- CuMessageA(tc,"%d milliseconds",(CL_NS(util)::Misc::currentTimeMillis()-start));
+ CuMessageA(tc,"%d milliseconds", (int32_t)(CL_NS(util)::Misc::currentTimeMillis()-start));
CuMessageA(tc,"/%d pops\n",count);
CLUCENE_ASSERT(sum == sum);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
