You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2010/03/20 02:09:28 UTC

svn commit: r925512 - in /lucene/solr/branches/newtrunk/solr/src/test: org/apache/solr/ org/apache/solr/analysis/ org/apache/solr/client/solrj/ org/apache/solr/client/solrj/embedded/ org/apache/solr/client/solrj/response/ org/apache/solr/common/util/ o...

Author: yonik
Date: Sat Mar 20 01:09:28 2010
New Revision: 925512

URL: http://svn.apache.org/viewvc?rev=925512&view=rev
Log:
tests: kill prints, or change to logging

Modified:
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/OutputWriterTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/TestSort.java
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
    lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/BasicFunctionalityTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/BasicFunctionalityTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/BasicFunctionalityTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/BasicFunctionalityTest.java Sat Mar 20 01:09:28 2010
@@ -68,7 +68,6 @@ public class BasicFunctionalityTest exte
   public static void beforeClass() throws Exception {
     initCore("solrconfig.xml","schema.xml");
   }
-
   // tests the performance of dynamic field creation and
   // field property testing.
   /***

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/OutputWriterTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/OutputWriterTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/OutputWriterTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/OutputWriterTest.java Sat Mar 20 01:09:28 2010
@@ -74,7 +74,7 @@ public class OutputWriterTest extends Ab
         lrf.args.put("wt", "xslt");
         lrf.args.put("tr", "dummy.xsl");
         String out = h.query(req("foo"));
-        System.out.println(out);
+        // System.out.println(out);
         assertTrue(out.contains("DUMMY"));
     }
     

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java Sat Mar 20 01:09:28 2010
@@ -59,8 +59,8 @@ public class TestPatternTokenizerFactory
       
       TokenStream stream = tokenizer.create( new StringReader( test[2] ) );
       String out = tsToString( stream );
-      System.out.println( test[2] + " ==> " + out );
-      
+      // System.out.println( test[2] + " ==> " + out );
+
       assertEquals("pattern: "+test[1]+" with input: "+test[2], test[3], out );
       
       // Make sure it is the same as if we called 'split'

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java Sat Mar 20 01:09:28 2010
@@ -46,7 +46,7 @@ public abstract class LargeVolumeTestBas
       threads[i] = new DocThread( "T"+i+":" );
       threads[i].setName("DocThread-" + i);
       threads[i].start();
-      System.out.println("Started thread: " + i);
+      log.info("Started thread: " + i);
     }
     for (int i=0; i<threadCount; i++) {
       threads[i].join();
@@ -57,7 +57,7 @@ public abstract class LargeVolumeTestBas
     gserver.commit();
     
     query(threadCount * numdocs);
-    System.out.println("done");
+    log.info("done");
   }
 
   private void query(int count) throws SolrServerException, IOException {
@@ -90,7 +90,7 @@ public abstract class LargeVolumeTestBas
             docs = new ArrayList<SolrInputDocument>();
           }
           if (i > 0 && i % 5000 == 0) {
-            System.out.println(getName() + " - Committing " + i);
+            log.info(getName() + " - Committing " + i);
             resp = tserver.commit();
             assertEquals(0, resp.getStatus());
           }

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Sat Mar 20 01:09:28 2010
@@ -74,15 +74,15 @@ abstract public class SolrExampleTests e
     Assert.assertTrue(doc.getField("name").getValue() != null );
         
     UpdateResponse upres = server.add( doc ); 
-    System.out.println( "ADD:"+upres.getResponse() );
+    // System.out.println( "ADD:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     upres = server.commit( true, true );
-    System.out.println( "COMMIT:"+upres.getResponse() );
+    // System.out.println( "COMMIT:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     upres = server.optimize( true, true );
-    System.out.println( "OPTIMIZE:"+upres.getResponse() );
+    // System.out.println( "OPTIMIZE:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     SolrQuery query = new SolrQuery();
@@ -119,15 +119,15 @@ abstract public class SolrExampleTests e
     docs.add(doc5);
     
     upres = server.add( docs ); 
-    System.out.println( "ADD:"+upres.getResponse() );
+    // System.out.println( "ADD:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     upres = server.commit( true, true );
-    System.out.println( "COMMIT:"+upres.getResponse() );
+    // System.out.println( "COMMIT:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     upres = server.optimize( true, true );
-    System.out.println( "OPTIMIZE:"+upres.getResponse() );
+    // System.out.println( "OPTIMIZE:"+upres.getResponse() );
     Assert.assertEquals(0, upres.getStatus());
     
     query = new SolrQuery("*:*");
@@ -192,7 +192,7 @@ abstract public class SolrExampleTests e
     QueryResponse rsp = server.query( query );
     
     assertEquals( 2, rsp.getResults().getNumFound() );
-    System.out.println( rsp.getResults() );
+    // System.out.println( rsp.getResults() );
     
     // Now do it again
     server.add( docs );
@@ -543,7 +543,7 @@ abstract public class SolrExampleTests e
     assertEquals( 1, facets.size() );
     FacetField ff = facets.get( 0 );
     assertEquals( "features", ff.getName() );
-    System.out.println( "111: "+ff.getValues() );
+    // System.out.println( "111: "+ff.getValues() );
     // check all counts
     assertEquals( "[two (5), three (3), five (2), four (2)]", ff.getValues().toString() );
     
@@ -564,6 +564,6 @@ abstract public class SolrExampleTests e
     rsp = server.query( query );
     ff = rsp.getFacetField( "features" );
     
-    System.out.println( rsp.getResults().getNumFound() + " :::: 444: "+ff.getValues() );
+    // System.out.println( rsp.getResults().getNumFound() + " :::: 444: "+ff.getValues() );
   }
 }

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java Sat Mar 20 01:09:28 2010
@@ -89,7 +89,7 @@ public class SolrQueryTest extends TestC
     q.setTimeAllowed(null);
     Assert.assertEquals(null, q.getTimeAllowed() ); 
     
-    System.out.println(q);
+    // System.out.println(q);
   }
   
   public void testFacetSort() {

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java Sat Mar 20 01:09:28 2010
@@ -47,7 +47,7 @@ public class SolrExampleJettyTest extend
     jetty = new JettySolrRunner( context, 0 );
     jetty.start();
     port = jetty.getLocalPort();
-    System.out.println("Assigned Port#" + port);
+    log.info("Assigned Port#" + port);
     server = this.createNewSolrServer();
   }
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java Sat Mar 20 01:09:28 2010
@@ -43,7 +43,7 @@ public class SolrExampleStreamingTest ex
     jetty = new JettySolrRunner( context, 0 );
     jetty.start();
     port = jetty.getLocalPort();
-    System.out.println("Assigned Port#" + port);
+    log.info("Assigned Port#" + port);
     server = this.createNewSolrServer();
   }
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java Sat Mar 20 01:09:28 2010
@@ -49,9 +49,11 @@ public class QueryResponseTest {
     
     for (FacetField f : qr.getFacetDates()) {
       Assert.assertNotNull(f);
-      System.out.println(f.toString());
-      System.out.println("GAP: " + f.getGap());
-      System.out.println("END: " + f.getEnd());
+
+      // TODO - test values?
+      // System.out.println(f.toString());
+      // System.out.println("GAP: " + f.getGap());
+      // System.out.println("END: " + f.getEnd());
     }
   }
 }

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java Sat Mar 20 01:09:28 2010
@@ -51,7 +51,7 @@ public class TestSpellCheckResponse exte
     jetty = new JettySolrRunner(context, 0);
     jetty.start();
     port = jetty.getLocalPort();
-    System.out.println("Assigned Port: " + port);
+    log.info("Assigned Port: " + port);
     server = this.createNewSolrServer();
   }
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java Sat Mar 20 01:09:28 2010
@@ -44,16 +44,14 @@ public class TestFastInputStream {
     char[] cbuf = new char[ss.length()];
     readChars(gzis, cbuf, 0, ss.length());
     assertEquals(new String(cbuf), ss);
-    System.out.println("passes w/o FastInputStream");
+    // System.out.println("passes w/o FastInputStream");
 
     ByteArrayInputStream bis = new ByteArrayInputStream(b.toByteArray(), 0, b.size());
     gzis = new GZIPInputStream(new FastInputStream(bis));
     cbuf = new char[ss.length()];
     readChars(gzis, cbuf, 0, ss.length());
     assertEquals(new String(cbuf), ss);
-    System.out.println("passes w FastInputStream");
-
-
+    // System.out.println("passes w FastInputStream");
   }
 
   //code copied from NamedListCodec#readChars

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxIntegration.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxIntegration.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxIntegration.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxIntegration.java Sat Mar 20 01:09:28 2010
@@ -61,7 +61,7 @@ public class TestJmxIntegration extends 
   @Test
   public void testJmxRegistration() throws Exception {
     List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-    System.out.println("Servers in testJmxRegistration: " + servers);
+    log.info("Servers in testJmxRegistration: " + servers);
     assertNotNull("MBeanServers were null", servers);
     assertFalse("No MBeanServer was found", servers.isEmpty());
 
@@ -83,8 +83,8 @@ public class TestJmxIntegration extends 
   @Test
   public void testJmxUpdate() throws Exception {
     List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-    System.err.println("Servers in testJmxUpdate: " + servers);
-    System.err.println(h.getCore().getInfoRegistry());
+    log.info("Servers in testJmxUpdate: " + servers);
+    log.info(h.getCore().getInfoRegistry().toString());
 
     SolrInfoMBean bean = null;
     // wait until searcher is registered
@@ -97,7 +97,7 @@ public class TestJmxIntegration extends 
     ObjectName searcher = getObjectName("searcher", bean);
 
     MBeanServer mbeanServer = servers.get(0);
-    System.err.println("Mbeans in server: " + mbeanServer.queryNames(null, null));
+    log.info("Mbeans in server: " + mbeanServer.queryNames(null, null));
 
     assertFalse("No mbean found for SolrIndexSearcher", mbeanServer.queryMBeans(searcher, null).isEmpty());
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java Sat Mar 20 01:09:28 2010
@@ -59,7 +59,7 @@ public class TestJmxMonitoredMap {
         ServerSocket server = new ServerSocket(0);
         port = server.getLocalPort();
         server.close();
-        System.out.println("Using port: " + port);
+        // System.out.println("Using port: " + port);
         try {
           LocateRegistry.createRegistry(port);
         } catch (RemoteException e) {

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java Sat Mar 20 01:09:28 2010
@@ -45,7 +45,7 @@ public class TestXIncludeConfig extends 
       SolrRequestHandler solrRequestHandler = core.getRequestHandler("dismaxOldStyleDefaults");
       assertNotNull("Solr Req Handler is null", solrRequestHandler);
     } else {
-      System.out.println("Didn't run testXInclude, because this XML DocumentBuilderFactory doesn't support it");
+      log.info("Didn't run testXInclude, because this XML DocumentBuilderFactory doesn't support it");
     }
 
   }

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Sat Mar 20 01:09:28 2010
@@ -218,7 +218,7 @@ public class QueryElevationComponentTest
     out.flush();
     out.close();
     
-    System.out.println( "OUT:"+file.getAbsolutePath() );
+    log.info( "OUT:"+file.getAbsolutePath() );
   }
 
   public void testElevationReloading() throws Exception

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java Sat Mar 20 01:09:28 2010
@@ -83,7 +83,7 @@ public class TermVectorComponentTest ext
     NamedList values = rsp.getValues();
     NamedList termVectors = (NamedList) values.get(TermVectorComponent.TERM_VECTORS);
     assertTrue("termVectors is null and it shouldn't be", termVectors != null);
-    System.out.println("TVs:" + termVectors);
+    // System.out.println("TVs:" + termVectors);
     NamedList doc = (NamedList) termVectors.getVal(0);
     assertTrue("doc is null and it shouldn't be", doc != null);
     assertTrue(doc.size() + " does not equal: " + 2, doc.size() == 2);
@@ -126,7 +126,7 @@ public class TermVectorComponentTest ext
     NamedList values = rsp.getValues();
     NamedList termVectors = (NamedList) values.get(TermVectorComponent.TERM_VECTORS);
     assertTrue("termVectors is null and it shouldn't be", termVectors != null);
-    System.out.println("TVs: " + termVectors);
+    // System.out.println("TVs: " + termVectors);
     NamedList doc = (NamedList) termVectors.getVal(0);
     assertTrue("doc is null and it shouldn't be", doc != null);
     assertTrue(doc.size() + " does not equal: " + 2, doc.size() == 2);
@@ -212,7 +212,7 @@ public class TermVectorComponentTest ext
     assertTrue("rb.outgoing Size: " + rb.outgoing.size() + " is not: " + rb.shards.length, rb.outgoing.size() == rb.shards.length);
     for (ShardRequest request : rb.outgoing) {
       ModifiableSolrParams solrParams = request.params;
-      System.out.println("Shard: " + Arrays.asList(request.shards) + " Params: " + solrParams);
+      log.info("Shard: " + Arrays.asList(request.shards) + " Params: " + solrParams);
     }
   }
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java Sat Mar 20 01:09:28 2010
@@ -43,7 +43,7 @@ public class HighlighterConfigTest exten
 	  public void testConfig()
 	  {
 	    SolrHighlighter highlighter = h.getCore().getHighlighter();
-	    System.out.println( "highlighter" );
+	    log.info( "highlighter" );
 
 	    assertTrue( highlighter instanceof DummyHighlighter );
 	    

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java Sat Mar 20 01:09:28 2010
@@ -59,7 +59,7 @@ public class BadIndexSchemaTest extends 
     IndexSchema schema = core.getSchema();
 
     for( Throwable t : SolrConfig.severeErrors ) {
-      System.out.println( "ERROR:"+t.getMessage() );
+      log.error( "ERROR:"+t.getMessage() );
     }
     
     assertEquals( 3, SolrConfig.severeErrors.size() );

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/TestSort.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/TestSort.java Sat Mar 20 01:09:28 2010
@@ -176,7 +176,7 @@ public class TestSort extends AbstractSo
           int id = sdocs[j].doc;
           String s = (String)((FieldDoc)sdocs[j]).fields[sortIdx];
           if (id != collectedDocs.get(j).doc) {
-            System.out.println("Error at pos " + j);
+            log.error("Error at pos " + j);
           }
           assertEquals(id, collectedDocs.get(j).doc);
         }

Modified: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java Sat Mar 20 01:09:28 2010
@@ -274,7 +274,7 @@ public class TestFunctionQuery extends A
       }
 
       singleTest(field, "\0", answers);
-      System.out.println("Done test "+i);
+      // System.out.println("Done test "+i);
     }
   }
 

Modified: lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml?rev=925512&r1=925511&r2=925512&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/solr/branches/newtrunk/solr/src/test/test-files/solr/conf/solrconfig.xml Sat Mar 20 01:09:28 2010
@@ -44,7 +44,12 @@
        It defaults to "index" if not present, and should probably
        not be changed if replication is in use. -->
   <dataDir>${solr.data.dir:./solr/data}</dataDir>
-  
+
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based and not persistent. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
   <luceneMatchVersion>3.1</luceneMatchVersion>
 
   <indexDefaults>