manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1520939 - in /manifoldcf/trunk: framework/core/src/test/java/org/apache/manifoldcf/core/tests/ tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/
Date Sun, 08 Sep 2013 23:15:19 GMT
Author: kwright
Date: Sun Sep  8 23:15:19 2013
New Revision: 1520939

URL: http://svn.apache.org/r1520939
Log:
Test infrastructure changes, and runt test which will eventually exercise reset logic.  Part
of CONNECTORS-733.

Added:
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
  (with props)
    manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
  (with props)
    manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
  (with props)
Modified:
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDB.java
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDBext.java
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseMySQL.java
    manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BasePostgresql.java

Added: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java?rev=1520939&view=auto
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
(added)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
Sun Sep  8 23:15:19 2013
@@ -0,0 +1,145 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.core.tests;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.core.system.ManifoldCF;
+
+import java.io.*;
+import java.util.*;
+import org.junit.*;
+
+/** This is a testing base class that is responsible for selecting the database via an abstract
method which can be overridden. */
+public abstract class BaseDatabase extends Base
+{
+
+  /** Method to add properties to properties.xml contents.
+  * Override this method to add properties clauses to the property file.
+  */
+  @Override
+  protected void writeProperties(StringBuilder output)
+    throws Exception
+  {
+    super.writeProperties(output);
+    writeDatabaseProperties(output);
+    writeDatabaseMaxQueryTimeProperty(output);
+    writeDatabaseMaxHandlesProperty(output);
+    writeCrawlerThreadsProperty(output);
+    writeExpireThreadsProperty(output);
+    writeCleanupThreadsProperty(output);
+    writeDeleteThreadsProperty(output);
+    writeConnectorDebugProperty(output);
+  }
+  
+  /** Method to add database-specific (as opposed to test-specific) parameters to
+  * property file.
+  */
+  protected void writeDatabaseProperties(StringBuilder output)
+    throws Exception
+  {
+    writeDatabaseImplementationProperty(output);
+    writeDatabaseControlProperties(output);
+  }
+  
+  /** Method to write the database implementation property */
+  protected void writeDatabaseImplementationProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\""+getDatabaseImplementationClass()+"\"/>\n"
+    );
+  }
+  
+  /** Method to get database implementation class */
+  protected abstract String getDatabaseImplementationClass()
+    throws Exception;
+
+  /** Method to write the database control properties. */
+  protected abstract void writeDatabaseControlProperties(StringBuilder output)
+    throws Exception;
+  
+  /** Method to write the max query time. */
+  protected void writeDatabaseMaxQueryTimeProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\""+getDatabaseMaxQueryTimeProperty()+"\"/>\n"
+    );
+  }
+  
+  /** Method to get max query time property. */
+  protected int getDatabaseMaxQueryTimeProperty()
+    throws Exception
+  {
+    return 30;
+  }
+  
+  /** Method to write the max handles. */
+  protected void writeDatabaseMaxHandlesProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
+    );
+  }
+  
+  /** Method to write crawler threads property. */
+  protected void writeCrawlerThreadsProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+    );
+  }
+  
+  /** Method to write expire threads property. */
+  protected void writeExpireThreadsProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+    );
+  }
+
+  /** Method to write cleanup threads property. */
+  protected void writeCleanupThreadsProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+    );
+  }
+
+  /** Method to write delete threads property. */
+  protected void writeDeleteThreadsProperty(StringBuilder output)
+    throws Exception
+  {
+    output.append(
+      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+    );
+  }
+
+  /** Method to write connector debug property. */
+  protected void writeConnectorDebugProperty(StringBuilder output)
+    throws Exception
+  {
+    // By default, leave debug off
+  }
+
+}

Propchange: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDatabase.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java?rev=1520939&r1=1520938&r2=1520939&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
Sun Sep  8 23:15:19 2013
@@ -26,27 +26,26 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a testing base class that is responsible for setting up/tearing down the core
Derby database. */
-public class BaseDerby extends Base
+public class BaseDerby extends BaseDatabase
 {
 
-  /** Method to add properties to properties.xml contents.
-  * Override this method to add properties clauses to the property file.
-  */
-  protected void writeProperties(StringBuilder output)
+  /** Method to get database implementation class */
+  @Override
+  protected String getDatabaseImplementationClass()
+    throws Exception
+  {
+    return "org.apache.manifoldcf.core.database.DBInterfaceDerby";
+  }
+
+  /** Method to set database properties */
+  @Override
+  protected void writeDatabaseControlProperties(StringBuilder output)
     throws Exception
   {
-    super.writeProperties(output);
     String currentPathString = currentPath.getAbsolutePath();
     output.append(
-      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\"org.apache.manifoldcf.core.database.DBInterfaceDerby\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.derbydatabasepath\" value=\""+currentPathString.replaceAll("\\\\","/")+"\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+
-      //"  <property name=\"org.apache.manifoldcf.connectors\" value=\"DEBUG\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
+      "  <property name=\"org.apache.manifoldcf.derbydatabasepath\" value=\""+currentPathString.replaceAll("\\\\","/")+"\"/>\n"
     );
   }
+
 }

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDB.java?rev=1520939&r1=1520938&r2=1520939&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDB.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDB.java
Sun Sep  8 23:15:19 2013
@@ -26,26 +26,26 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a testing base class that is responsible for setting up/tearing down the core
Derby database. */
-public class BaseHSQLDB extends Base
+public class BaseHSQLDB extends BaseDatabase
 {
-  /** Method to add properties to properties.xml contents.
-  * Override this method to add properties clauses to the property file.
-  */
-  protected void writeProperties(StringBuilder output)
+  
+  /** Method to get database implementation class */
+  @Override
+  protected String getDatabaseImplementationClass()
+    throws Exception
+  {
+    return "org.apache.manifoldcf.core.database.DBInterfaceHSQLDB";
+  }
+
+  /** Method to set database properties */
+  @Override
+  protected void writeDatabaseControlProperties(StringBuilder output)
     throws Exception
   {
-    super.writeProperties(output);
     String currentPathString = currentPath.getAbsolutePath();
     output.append(
-      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\"org.apache.manifoldcf.core.database.DBInterfaceHSQLDB\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.hsqldbdatabasepath\" value=\""+currentPathString.replaceAll("\\\\","/")+"\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
+      "  <property name=\"org.apache.manifoldcf.hsqldbdatabasepath\" value=\""+currentPathString.replaceAll("\\\\","/")+"\"/>\n"
     );
   }
-  
+
 }

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDBext.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDBext.java?rev=1520939&r1=1520938&r2=1520939&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDBext.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseHSQLDBext.java
Sun Sep  8 23:15:19 2013
@@ -27,33 +27,25 @@ import org.junit.*;
 import java.lang.reflect.*;
 
 /** This is a testing base class that is responsible for setting up/tearing down the core
HSQLDB remote database. */
-public class BaseHSQLDBext extends Base
+public class BaseHSQLDBext extends BaseHSQLDB
 {
   protected DatabaseThread databaseThread = null;
   
-  /** Method to add properties to properties.xml contents.
-  * Override this method to add properties clauses to the property file.
-  */
-  protected void writeProperties(StringBuilder output)
+  /** Method to set database properties */
+  @Override
+  protected void writeDatabaseControlProperties(StringBuilder output)
     throws Exception
   {
-    super.writeProperties(output);
     output.append(
-      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\"org.apache.manifoldcf.core.database.DBInterfaceHSQLDB\"/>\n"
+
       "  <property name=\"org.apache.manifoldcf.hsqldbdatabaseprotocol\" value=\"hsql\"/>\n"
+
       "  <property name=\"org.apache.manifoldcf.hsqldbdatabaseserver\" value=\"localhost\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.hsqldbdatabaseinstance\" value=\"xdb\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
-      );
+      "  <property name=\"org.apache.manifoldcf.hsqldbdatabaseinstance\" value=\"xdb\"/>\n"
+    );
   }
 
   /** Method to get database superuser name.
   */
+  @Override
   protected String getDatabaseSuperuserName()
     throws Exception
   {
@@ -62,6 +54,7 @@ public class BaseHSQLDBext extends Base
   
   /** Method to get database superuser password.
   */
+  @Override
   protected String getDatabaseSuperuserPassword()
     throws Exception
   {

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseMySQL.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseMySQL.java?rev=1520939&r1=1520938&r2=1520939&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseMySQL.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseMySQL.java
Sun Sep  8 23:15:19 2013
@@ -26,34 +26,41 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a testing base class that is responsible for setting up/tearing down the core
MySQL database. */
-public class BaseMySQL extends Base
+public class BaseMySQL extends BaseDatabase
 {
   protected final static String SUPER_USER_NAME = "root";
   protected final static String SUPER_USER_PASSWORD = "mysql";
   
-  /** Method to add properties to properties.xml contents.
-  * Override this method to add properties clauses to the property file.
-  */
-  protected void writeProperties(StringBuilder output)
+  /** Method to get database implementation class */
+  @Override
+  protected String getDatabaseImplementationClass()
+    throws Exception
+  {
+    return "org.apache.manifoldcf.core.database.DBInterfaceMySQL";
+  }
+
+  /** Method to set database properties */
+  @Override
+  protected void writeDatabaseControlProperties(StringBuilder output)
     throws Exception
   {
-    super.writeProperties(output);
     output.append(
-      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\"org.apache.manifoldcf.core.database.DBInterfaceMySQL\"/>\n"
+
       "  <property name=\"org.apache.manifoldcf.database.name\" value=\"testdb\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.username\" value=\"testuser\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"15\"/>\n"
+      "  <property name=\"org.apache.manifoldcf.database.username\" value=\"testuser\"/>\n"
     );
   }
 
+  /** Method to get max query time property. */
+  @Override
+  protected int getDatabaseMaxQueryTimeProperty()
+    throws Exception
+  {
+    return 15;
+  }
+
   /** Method to get database superuser name.
   */
+  @Override
   protected String getDatabaseSuperuserName()
     throws Exception
   {
@@ -62,6 +69,7 @@ public class BaseMySQL extends Base
   
   /** Method to get database superuser password.
   */
+  @Override
   protected String getDatabaseSuperuserPassword()
     throws Exception
   {

Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BasePostgresql.java?rev=1520939&r1=1520938&r2=1520939&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BasePostgresql.java
(original)
+++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BasePostgresql.java
Sun Sep  8 23:15:19 2013
@@ -26,34 +26,41 @@ import java.util.*;
 import org.junit.*;
 
 /** This is a testing base class that is responsible for setting up/tearing down the core
Postgresql database. */
-public class BasePostgresql extends Base
+public class BasePostgresql extends BaseDatabase
 {
   protected final static String SUPER_USER_NAME = "postgres";
   protected final static String SUPER_USER_PASSWORD = "postgres";
 
-  /** Method to add properties to properties.xml contents.
-  * Override this method to add properties clauses to the property file.
-  */
-  protected void writeProperties(StringBuilder output)
+  /** Method to get database implementation class */
+  @Override
+  protected String getDatabaseImplementationClass()
+    throws Exception
+  {
+    return "org.apache.manifoldcf.core.database.DBInterfacePostgreSQL";
+  }
+
+  /** Method to set database properties */
+  @Override
+  protected void writeDatabaseControlProperties(StringBuilder output)
     throws Exception
   {
-    super.writeProperties(output);
     output.append(
-      "  <property name=\"org.apache.manifoldcf.databaseimplementationclass\" value=\"org.apache.manifoldcf.core.database.DBInterfacePostgreSQL\"/>\n"
+
       "  <property name=\"org.apache.manifoldcf.database.name\" value=\"testdb\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.username\" value=\"testuser\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.threads\" value=\"30\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.expirethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.cleanupthreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.crawler.deletethreads\" value=\"10\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxhandles\" value=\"80\"/>\n"
+
-      "  <property name=\"org.apache.manifoldcf.database.maxquerytime\" value=\"15\"/>\n"
+      "  <property name=\"org.apache.manifoldcf.database.username\" value=\"testuser\"/>\n"
     );
   }
 
+  /** Method to get max query time property. */
+  @Override
+  protected int getDatabaseMaxQueryTimeProperty()
+    throws Exception
+  {
+    return 15;
+  }
+
   /** Method to get database superuser name.
   */
+  @Override
   protected String getDatabaseSuperuserName()
     throws Exception
   {
@@ -62,6 +69,7 @@ public class BasePostgresql extends Base
   
   /** Method to get database superuser password.
   */
+  @Override
   protected String getDatabaseSuperuserPassword()
     throws Exception
   {

Added: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java?rev=1520939&view=auto
==============================================================================
--- manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
(added)
+++ manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
Sun Sep  8 23:15:19 2013
@@ -0,0 +1,55 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.rss_tests;
+
+import org.apache.manifoldcf.core.interfaces.*;
+
+import java.io.*;
+import java.util.*;
+import org.junit.*;
+import java.sql.*;
+import javax.naming.*;
+import javax.sql.*;
+
+/** This is a very basic sanity check */
+public class FlakyDerbyInstance extends org.apache.manifoldcf.core.database.DBInterfaceDerby
+{
+
+  public FlakyDerbyInstance(IThreadContext tc, String databaseName, String userName, String
password)
+    throws ManifoldCFException
+  {
+    super(tc,databaseName,userName,password);
+  }
+
+  public FlakyDerbyInstance(IThreadContext tc, String databaseName)
+    throws ManifoldCFException
+  {
+    super(tc,databaseName);
+  }
+
+  @Override
+  protected IResultSet execute(Connection connection, String query, List params, boolean
bResults, int maxResults,
+    ResultSpecification spec, ILimitChecker returnLimit)
+    throws ManifoldCFException
+  {
+    // MHL
+    return super.execute(connection,query,params,bResults,maxResults,spec,returnLimit);
+  }
+
+}

Propchange: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/FlakyDerbyInstance.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java?rev=1520939&view=auto
==============================================================================
--- manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
(added)
+++ manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
Sun Sep  8 23:15:19 2013
@@ -0,0 +1,41 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.rss_tests;
+
+import java.io.*;
+import java.util.*;
+import org.junit.*;
+
+/** This is a very basic sanity check */
+public class RSSFlakyDerbyIT extends RSSSimpleCrawlDerbyIT
+{
+  public RSSFlakyDerbyIT()
+  {
+    super();
+  }
+  
+  /** Method to get database implementation class */
+  @Override
+  protected String getDatabaseImplementationClass()
+    throws Exception
+  {
+    return FlakyDerbyInstance.class.getName();
+  }
+
+}

Propchange: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/tests/rss/src/test/java/org/apache/manifoldcf/rss_tests/RSSFlakyDerbyIT.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message