https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109421
Revision: 109421
Author: oren
Date: 2012-01-18 18:46:39 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
changed WikiTesTcase to reflect the current project setup and renamed it to
indicate that it is abstract
added folders for javascripts and php
Modified Paths:
--------------
trunk/lucene-search-3/pom.xml
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/AnalysisTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/FastWikiTokenizerTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WikiQueryParserTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WordNetTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/beans/TitleTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/index/WikiIndexModifierTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/search/PrefixMatchTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/SuggestUnitTest.java
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/api/SpellCheckIndexerTest.java
Added Paths:
-----------
trunk/lucene-search-3/src/main/javascript/
trunk/lucene-search-3/src/main/php/
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/AbstractWikiTestCase.java
Removed Paths:
-------------
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/WikiTestCase.java
Modified: trunk/lucene-search-3/pom.xml
===================================================================
--- trunk/lucene-search-3/pom.xml 2012-01-18 18:37:28 UTC (rev 109420)
+++ trunk/lucene-search-3/pom.xml 2012-01-18 18:46:39 UTC (rev 109421)
@@ -410,6 +410,7 @@
<scm>
<developerConnection>oren</developerConnection>
<url>http://svn.wikimedia.org/svnroot/mediawiki/trunk/lucene-search-3</url>
+ <connection>svn+ssh</connection>
</scm>
<ciManagement>
<system>jenkins</system>
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/AnalysisTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/AnalysisTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/AnalysisTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -17,9 +17,9 @@
import org.wikimedia.lsearch.config.GlobalConfiguration;
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.ranks.StringList;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class AnalysisTest extends WikiTestCase {
+public class AnalysisTest extends AbstractWikiTestCase {
Analyzer a = null;
Configuration config = null;
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/FastWikiTokenizerTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/FastWikiTokenizerTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/FastWikiTokenizerTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -21,9 +21,9 @@
import org.wikimedia.lsearch.config.Configuration;
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.index.WikiIndexModifier;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class FastWikiTokenizerTest extends WikiTestCase {
+public class FastWikiTokenizerTest extends AbstractWikiTestCase {
IndexId iid;
TokenizerOptions options;
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WikiQueryParserTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WikiQueryParserTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WikiQueryParserTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -16,11 +16,11 @@
import org.wikimedia.lsearch.config.GlobalConfiguration;
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.index.WikiIndexModifier;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
import junit.framework.TestCase;
-public class WikiQueryParserTest extends WikiTestCase {
+public class WikiQueryParserTest extends AbstractWikiTestCase {
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WordNetTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WordNetTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/analyzers/WordNetTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -2,9 +2,9 @@
import java.util.ArrayList;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class WordNetTest extends WikiTestCase {
+public class WordNetTest extends AbstractWikiTestCase {
protected ArrayList<String> list(String[] strs){
ArrayList<String> l = new ArrayList<String>();
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/beans/TitleTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/beans/TitleTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/beans/TitleTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -1,8 +1,8 @@
package org.wikimedia.lsearch.beans;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class TitleTest extends WikiTestCase {
+public class TitleTest extends AbstractWikiTestCase {
public void testStatic(){
assertEquals(0,Title.namespaceAsInt("0:Title"));
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/config/GlobalConfigurationTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -12,14 +12,14 @@
import org.apache.log4j.Logger;
import org.wikimedia.lsearch.search.NamespaceFilter;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
import org.wikimedia.lsearch.util.StringUtils;
/**
* @author rainman
*
*/
-public class GlobalConfigurationTest extends WikiTestCase { // NOPMD by
OrenBochman on 1/15/12 3:38 AM
+public class GlobalConfigurationTest extends AbstractWikiTestCase { // NOPMD
by OrenBochman on 1/15/12 3:38 AM
private static final Logger LOG =
Logger.getLogger(GlobalConfigurationTest.class.getName());
private transient GlobalConfiguration global = null;
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/index/WikiIndexModifierTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/index/WikiIndexModifierTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/index/WikiIndexModifierTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -19,9 +19,9 @@
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.ranks.StringList;
import org.wikimedia.lsearch.related.RelatedTitle;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class WikiIndexModifierTest extends WikiTestCase {
+public class WikiIndexModifierTest extends AbstractWikiTestCase {
Document doc = null;
Analyzer analyzer = null;
Analyzer highlightAnalyzer = null;
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/search/PrefixMatchTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/search/PrefixMatchTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/search/PrefixMatchTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -1,11 +1,11 @@
package org.wikimedia.lsearch.search;
import org.apache.lucene.search.ArticleNamespaceScaling;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.search.SearchEngine.PrefixMatch;
-public class PrefixMatchTest extends WikiTestCase {
+public class PrefixMatchTest extends AbstractWikiTestCase {
public void testDeserialization(){
IndexId iid = IndexId.get("enwiki");
PrefixMatch m = new PrefixMatch("0:Some_title 10
",iid.getNamespaceScaling());
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/SuggestUnitTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/SuggestUnitTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/SuggestUnitTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -7,9 +7,9 @@
import org.wikimedia.lsearch.config.IndexId;
import org.wikimedia.lsearch.search.NamespaceFilter;
import org.wikimedia.lsearch.spell.dist.EditDistance;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class SuggestUnitTest extends WikiTestCase
+public class SuggestUnitTest extends AbstractWikiTestCase
{
public void testMakeNamespaces() throws IOException {
Modified:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/api/SpellCheckIndexerTest.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/api/SpellCheckIndexerTest.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/spell/api/SpellCheckIndexerTest.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -1,8 +1,8 @@
package org.wikimedia.lsearch.spell.api;
-import org.wikimedia.lsearch.test.WikiTestCase;
+import org.wikimedia.lsearch.test.AbstractWikiTestCase;
-public class SpellCheckIndexerTest extends WikiTestCase {
+public class SpellCheckIndexerTest extends AbstractWikiTestCase {
public void testMakeIndex(){
// TODO retest what goes into the final .spell index
}
Copied:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/AbstractWikiTestCase.java
(from rev 109409,
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/WikiTestCase.java)
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/AbstractWikiTestCase.java
(rev 0)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/AbstractWikiTestCase.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -0,0 +1,81 @@
+package org.wikimedia.lsearch.test;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.wikimedia.lsearch.analyzers.WikiQueryParser;
+import org.wikimedia.lsearch.config.Configuration;
+import org.wikimedia.lsearch.config.GlobalConfiguration;
+
+
+/**
+ * parent class for test that require that the configuration files be
initialized
+ *
+ * @author rainman
+ *
+ */
+public abstract class AbstractWikiTestCase extends TestCase {
+
+ public Configuration getConfig() {
+ return config;
+ }
+
+
+
+ public void setConfig(final Configuration config) {
+ this.config = config;
+ }
+
+
+ public GlobalConfiguration getGlobal() {
+ return global;
+ }
+
+
+ public void setGlobal(final GlobalConfiguration global) {
+ this.global = global;
+ }
+
+
+ protected Configuration config = null;
+
+ protected GlobalConfiguration global = null;
+
+ @Override
+ protected void setUp() {
+ if(config == null)
+ {
+ String winPathFixer;
+ if(System.getProperty("os.name").startsWith("Windows")){
+ winPathFixer = File.separator;
+ }else{
+ winPathFixer="";
+ }
+
+ Configuration.setConfigFile(
+ System.getProperty("user.dir")+
+ winPathFixer+
+ File.separator+"src"+
+ File.separator+"test"+
+ File.separator+"resources"+
+ File.separator+"lsearch.conf.test");
+
+ Configuration.setGlobalConfigUrl(
+ "file://"+
+ winPathFixer+
+ System.getProperty("user.dir")+
+ File.separator+"src"+
+ File.separator+"test"+
+ File.separator+"resources"+
+ File.separator+"lsearch-global.test");
+
+ config = Configuration.open();
+ global = GlobalConfiguration.getInstance();
+ WikiQueryParser.TITLE_BOOST = 2;
+ WikiQueryParser.ALT_TITLE_BOOST = 6;
+ WikiQueryParser.CONTENTS_BOOST = 1;
+ }
+ }
+
+}
Deleted:
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/WikiTestCase.java
===================================================================
---
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/WikiTestCase.java
2012-01-18 18:37:28 UTC (rev 109420)
+++
trunk/lucene-search-3/src/test/java/org/wikimedia/lsearch/test/WikiTestCase.java
2012-01-18 18:46:39 UTC (rev 109421)
@@ -1,79 +0,0 @@
-package org.wikimedia.lsearch.test;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.wikimedia.lsearch.analyzers.WikiQueryParser;
-import org.wikimedia.lsearch.config.Configuration;
-import org.wikimedia.lsearch.config.GlobalConfiguration;
-
-
-/**
- * parent class for test that require that the configuration files be
initialized
- *
- * @author rainman
- *
- */
-public abstract class WikiTestCase extends TestCase {
-
- public Configuration getConfig() {
- return config;
- }
-
-
-
- public void setConfig(final Configuration config) {
- this.config = config;
- }
-
-
- public GlobalConfiguration getGlobal() {
- return global;
- }
-
-
- public void setGlobal(final GlobalConfiguration global) {
- this.global = global;
- }
-
-
- protected Configuration config = null;
-
- protected GlobalConfiguration global = null;
-
- @Override
- protected void setUp() {
- if(config == null)
- {
- String winPathFixer;
- if(System.getProperty("os.name").startsWith("Windows")){
- winPathFixer = File.separator;
- }else{
- winPathFixer="";
- }
-
- Configuration.setConfigFile(
- System.getProperty("user.dir")+
- winPathFixer+
- File.separator+
- "test-data"+
- File.separator+
- "lsearch.conf.test");
-
- Configuration.setGlobalConfigUrl(
- "file://"+
- winPathFixer+
- System.getProperty("user.dir")+
- File.separator+"test-data"+
- File.separator+"lsearch-global.test");
-
- config = Configuration.open();
- global = GlobalConfiguration.getInstance();
- WikiQueryParser.TITLE_BOOST = 2;
- WikiQueryParser.ALT_TITLE_BOOST = 6;
- WikiQueryParser.CONTENTS_BOOST = 1;
- }
- }
-
-}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
