svn commit: r1510299 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/search/LuceneSearchProvider.java test/java/org/apache/wiki/search/SearchManagerTest.java
Author: metskem
Date: Sun Aug 4 18:36:34 2013
New Revision: 1510299
URL: http://svn.apache.org/r1510299
Log:
more JSPWIKI-799, a bit more sensible timings, let's how this runs on the
different jenkins nodes...
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1510299r1=1510298r2=1510299view=diff
==
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
Sun Aug 4 18:36:34 2013
@@ -191,7 +191,7 @@ public class LuceneSearchProvider implem
Date start = new Date();
IndexWriter writer = null;
-log.info(Starting Lucene reindexing, this can take a couple
minutes...);
+log.info(Starting Lucene reindexing, this can take a couple
of minutes...);
Directory luceneDir = new SimpleFSDirectory(dir, null);
Modified:
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1510299r1=1510298r2=1510299view=diff
==
---
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
Sun Aug 4 18:36:34 2013
@@ -34,7 +34,8 @@ import org.apache.wiki.WikiContext;
public class SearchManagerTest extends TestCase
{
-private static final long SLEEP_TIME = 1000L;
+private static final long SLEEP_TIME = 2000L;
+private static final int SLEEP_COUNT = 50;
TestEngine m_engine;
SearchManager m_mgr;
@@ -72,13 +73,12 @@ public class SearchManagerTest extends T
Collection waitForIndex( String text, String testName ) throws Exception
{
Collection res = null;
-int waitCount = 500;
-for( long l = 0; l waitCount; l++ )
+for( long l = 0; l SLEEP_COUNT; l++ )
{
if( res == null || res.isEmpty() )
{
Thread.sleep( SLEEP_TIME );
-System.out.println( SearchManagerTest.waitForIndex for +
testName + sleeping + l + (out of + waitCount + ) );
+System.out.println( SearchManagerTest.waitForIndex for +
testName + sleeping + l + (out of + SLEEP_COUNT + ) );
}
else
{
svn commit: r1510345 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/search/LuceneSearchProvider.java test/java/org/apache/wiki/search/SearchManagerTest.java
Author: juanpablo
Date: Sun Aug 4 21:05:58 2013
New Revision: 1510345
URL: http://svn.apache.org/r1510345
Log:
JSPWIKI-799 related; lucene files created inside target/test-classes instead of
inside /tmp
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java?rev=1510345r1=1510344r2=1510345view=diff
==
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
Sun Aug 4 21:05:58 2013
@@ -508,7 +508,7 @@ public class LuceneSearchProvider implem
LockObtainFailedException, IOException, ProviderException
{
IndexWriter writer = null;
-IndexWriterConfig writerConfig = new IndexWriterConfig(
Version.LUCENE_36, getLuceneAnalyzer() );
+IndexWriterConfig writerConfig = new IndexWriterConfig(
Version.LUCENE_44, getLuceneAnalyzer() );
writerConfig.setOpenMode( OpenMode.CREATE_OR_APPEND );
writer = new IndexWriter( luceneDir, writerConfig );
Modified:
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java?rev=1510345r1=1510344r2=1510345view=diff
==
---
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/search/SearchManagerTest.java
Sun Aug 4 21:05:58 2013
@@ -48,7 +48,6 @@ public class SearchManagerTest extends T
props.setProperty( SearchManager.PROP_SEARCHPROVIDER,
LuceneSearchProvider );
props.setProperty( jspwiki.lucene.initialdelay, 1 );
-props.setProperty( jspwiki.workDir, System.getProperty(
java.io.tmpdir ) + File.separator + Release.APPNAME );
TestEngine.emptyWorkDir(props);
Build failed in Jenkins: JSPWiki #186
See https://builds.apache.org/job/JSPWiki/186/ -- [...truncated 235 lines...] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 sec - in org.apache.wiki.ui.WikiCommandTest Running org.apache.wiki.parser.MarkupParserTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.apache.wiki.parser.MarkupParserTest Running org.apache.wiki.parser.JSPWikiMarkupParserTest Trying to crash parser with a line which is 198002 chars in size 100 page renderings: 0:00:00.382 (261.78010471204186 renderings/second) Tests run: 205, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.993 sec - in org.apache.wiki.parser.JSPWikiMarkupParserTest Running org.apache.wiki.parser.CreoleToJSPWikiTranslatorTest Tests run: 84, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.183 sec - in org.apache.wiki.parser.CreoleToJSPWikiTranslatorTest Running org.apache.wiki.search.SearchManagerTest SearchManagerTest.waitForIndex for testTitleSearch2 sleeping 0 (out of 50) SearchManagerTest.waitForIndex for testSimpleSearch sleeping 0 (out of 50) SearchManagerTest.waitForIndex for testTitleSearch sleeping 0 (out of 50) SearchManagerTest.waitForIndex for testSimpleSearch2 sleeping 0 (out of 50) SearchManagerTest.waitForIndex for testSimpleSearch3 sleeping 0 (out of 50) Tests run: 6, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 10.298 sec FAILURE! - in org.apache.wiki.search.SearchManagerTest testTitleSearch2(org.apache.wiki.search.SearchManagerTest) Time elapsed: 2.169 sec FAILURE! junit.framework.AssertionFailedError: no pages expected:1 but was:3 at junit.framework.Assert.fail(Assert.java:57) at junit.framework.Assert.failNotEquals(Assert.java:329) at junit.framework.Assert.assertEquals(Assert.java:78) at junit.framework.Assert.assertEquals(Assert.java:234) at junit.framework.TestCase.assertEquals(TestCase.java:401) at org.apache.wiki.search.SearchManagerTest.testTitleSearch2(SearchManagerTest.java:188) testTitleSearch(org.apache.wiki.search.SearchManagerTest) Time elapsed: 2.023 sec FAILURE! junit.framework.AssertionFailedError: no pages expected:1 but was:3 at junit.framework.Assert.fail(Assert.java:57) at junit.framework.Assert.failNotEquals(Assert.java:329) at junit.framework.Assert.assertEquals(Assert.java:78) at junit.framework.Assert.assertEquals(Assert.java:234) at junit.framework.TestCase.assertEquals(TestCase.java:401) at org.apache.wiki.search.SearchManagerTest.testTitleSearch(SearchManagerTest.java:171) Running org.apache.wiki.xmlrpc.RPCHandlerTest Real: Mon Aug 05 05:07:09 UTC 2013 RPC: Mon Aug 05 05:07:09 UTC 2013 RPC2: Mon Aug 05 05:07:09 UTC 2013 Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.1 sec - in org.apache.wiki.xmlrpc.RPCHandlerTest Running org.apache.wiki.WikiEngineTest Tests run: 43, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.711 sec - in org.apache.wiki.WikiEngineTest Running org.apache.wiki.VariableManagerTest Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.107 sec - in org.apache.wiki.VariableManagerTest Running org.apache.wiki.ReleaseTest Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.apache.wiki.ReleaseTest Running org.apache.wiki.i18n.InternationalizationManagerTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.apache.wiki.i18n.InternationalizationManagerTest Running org.apache.wiki.WikiSessionTest Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 sec - in org.apache.wiki.WikiSessionTest Running org.apache.wiki.util.SerializerTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.apache.wiki.util.SerializerTest Running org.apache.wiki.util.FileUtilTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec - in org.apache.wiki.util.FileUtilTest Running org.apache.wiki.util.TextUtilTest Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.05 sec - in org.apache.wiki.util.TextUtilTest Running org.apache.wiki.util.UtilJ2eeCompatTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.apache.wiki.util.UtilJ2eeCompatTest Running org.apache.wiki.util.PageSorterTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in org.apache.wiki.util.PageSorterTest Running org.apache.wiki.util.comparators.HumanComparatorTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.apache.wiki.util.comparators.HumanComparatorTest Running org.apache.wiki.util.CryptoUtilTest Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in org.apache.wiki.util.CryptoUtilTest Running org.apache.wiki.util.TimedCounterListTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.111 sec - in
Jenkins build is back to normal : JSPWiki #187
See https://builds.apache.org/job/JSPWiki/187/
