incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1227560 - in /incubator/lcf/trunk: build.xml tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
Date Thu, 05 Jan 2012 11:28:06 GMT
Author: kwright
Date: Thu Jan  5 11:28:05 2012
New Revision: 1227560

URL: http://svn.apache.org/viewvc?rev=1227560&view=rev
Log:
Infrastructure for wiki UI tests; part of CONNECTORS-339.

Added:
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
  (with props)
Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1227560&r1=1227559&r2=1227560&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu Jan  5 11:28:05 2012
@@ -2602,6 +2602,40 @@
         </junit>
     </target>
 
+    <target name="run-wiki-UI-tests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition"
if="wiki-tests.include">
+        <mkdir dir="test-derby-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-derby-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/webcrawler-tests/classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!--test name="org.apache.manifoldcf.webcrawler_tests.NavigationDerbyUI" todir="test-derby-output/wiki"/
-->
+            <!-- MHL -->
+        </junit>
+    </target>
+
     <target name="run-wiki-loadtests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition"
if="wiki-tests.include">
         <mkdir dir="test-derby-output/wiki"/>
         <junit fork="true" maxmemory="256m" dir="test-derby-output/wiki" outputtoformatters="true"
showoutput="true" haltonfailure="true">
@@ -4076,7 +4110,7 @@
 
     <target name="ldtest" depends="load-dr,load-hs"/>
 
-    <target name="uitest" depends="run-filesystem-UI-tests-derby,run-rss-UI-tests-derby,run-webcrawler-UI-tests-derby"/>
+    <target name="uitest" depends="run-filesystem-UI-tests-derby,run-rss-UI-tests-derby,run-webcrawler-UI-tests-derby,run-wiki-UI-tests-derby"/>
     
     <target name="all" depends="build,javadoc,doc,image,test-dr,test-hs"/>
 

Modified: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java?rev=1227560&r1=1227559&r2=1227560&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
(original)
+++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
Thu Jan  5 11:28:05 2012
@@ -27,14 +27,6 @@ import java.io.*;
 import java.util.*;
 import org.junit.*;
 
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.FilterHolder;
-import org.mortbay.log.Logger;
-
 /** Tests that run the "agents daemon" should be derived from this */
 public class BaseDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby
 {

Added: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java?rev=1227560&view=auto
==============================================================================
--- incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
(added)
+++ incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
Thu Jan  5 11:28:05 2012
@@ -0,0 +1,73 @@
+/* $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.wiki_tests;
+
+import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.agents.interfaces.*;
+import org.apache.manifoldcf.crawler.interfaces.*;
+import org.apache.manifoldcf.crawler.system.ManifoldCF;
+
+import java.io.*;
+import java.util.*;
+import org.junit.*;
+
+/** Tests that run the "agents daemon" should be derived from this */
+public class BaseUIDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIDerby
+{
+  protected MockWikiService wikiService = null;
+  
+  protected String[] getConnectorNames()
+  {
+    return new String[]{"Wiki Connector"};
+  }
+  
+  protected String[] getConnectorClasses()
+  {
+    return new String[]{"org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"};
+  }
+  
+  protected String[] getOutputNames()
+  {
+    return new String[]{"Null Output"};
+  }
+  
+  protected String[] getOutputClasses()
+  {
+    return new String[]{"org.apache.manifoldcf.agents.output.nullconnector.NullConnector"};
+  }
+  
+  // Setup and teardown the mock wiki service
+  
+  @Before
+  public void createWikiService()
+    throws Exception
+  {
+    wikiService = new MockWikiService(getClass());
+    wikiService.start();
+  }
+  
+  @After
+  public void shutdownWikiService()
+    throws Exception
+  {
+    if (wikiService != null)
+      wikiService.stop();
+  }
+  
+}

Propchange: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseUIDerby.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message