You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/02/18 10:07:47 UTC

svn commit: r1447155 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/lucene/facet/ lucene/ lucene/facet/ lucene/facet/src/test/org/apache/lucene/facet/

Author: sarowe
Date: Mon Feb 18 09:07:47 2013
New Revision: 1447155

URL: http://svn.apache.org/r1447155
Log:
IntelliJ configuration fixes:
- Make FacetTestCase abstract so that the IntelliJ test runner doesn't try to execute its tests under the facet module test run configuration
- In the facet module configuration, drop source directory facet/src/examples/ and add source directory facet/src/resources/
- Add -Xmx256m to the Lucene core test run configuration to avoid OOM in a couple tests
- Add resource pattern 'test-files:*' to .idea/compiler.xml, so that all files under */src/test-files/, regardless of file name/extension, will be copied over to the test output directory (previously .js files under solr/src/test-files/ were being excluded)
(merged trunk r1447154)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/compiler.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/facet/   (props changed)
    lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/compiler.xml?rev=1447155&r1=1447154&r2=1447155&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/compiler.xml Mon Feb 18 09:07:47 2013
@@ -3,6 +3,7 @@
   <component name="CompilerConfiguration">
     <wildcardResourcePatterns>
       <entry name="!*.(cpp|java|jflex|jflex-macro|jj|js|pl|py)"/>
+      <entry name="test-files:*"/>
     </wildcardResourcePatterns>
   </component>
   <component name="JavacSettings">

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1447155&r1=1447154&r2=1447155&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Mon Feb 18 09:07:47 2013
@@ -8,7 +8,7 @@
       <module name="lucene-core-tests" />
       <option name="TEST_OBJECT" value="package" />
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/lucene/core" />
-      <option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.2-SNAPSHOT -DtempDir=temp" />
+      <option name="VM_PARAMETERS" value="-Xmx256m -ea -Dlucene.version=4.2-SNAPSHOT -DtempDir=temp" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Module analyzers-common" type="JUnit" factoryName="JUnit">

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml?rev=1447155&r1=1447154&r2=1447155&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/facet/facet.iml Mon Feb 18 09:07:47 2013
@@ -6,7 +6,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/examples" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/work" />
     </content>

Modified: lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java?rev=1447155&r1=1447154&r2=1447155&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java Mon Feb 18 09:07:47 2013
@@ -37,7 +37,7 @@ import org.junit.BeforeClass;
  */
 
 @SuppressCodecs("Lucene3x")
-public class FacetTestCase extends LuceneTestCase {
+public abstract class FacetTestCase extends LuceneTestCase {
   
   private static final IntEncoder[] ENCODERS = new IntEncoder[] {
     new SortingIntEncoder(new UniqueValuesIntEncoder(new VInt8IntEncoder())),