Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1593B98BD for ; Wed, 28 Dec 2011 17:34:51 +0000 (UTC) Received: (qmail 15598 invoked by uid 500); 28 Dec 2011 17:34:51 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 15550 invoked by uid 500); 28 Dec 2011 17:34:50 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 15543 invoked by uid 99); 28 Dec 2011 17:34:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2011 17:34:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2011 17:34:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8A7CD23889DA; Wed, 28 Dec 2011 17:34:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225244 - in /incubator/lcf/trunk: ./ framework/core/src/test/java/org/apache/manifoldcf/core/tests/ framework/core/src/test/resource/org/apache/manifoldcf/core/tests/ framework/crawler-ui/src/main/webapp/ tests/filesystem/src/test/java/or... Date: Wed, 28 Dec 2011 17:34:27 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111228173428.8A7CD23889DA@eris.apache.org> Author: kwright Date: Wed Dec 28 17:34:27 2011 New Revision: 1225244 URL: http://svn.apache.org/viewvc?rev=1225244&view=rev Log: First run browser test (already detected a bug!). Part of CONNECTORS-339. Added: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java - copied, changed from r1225189, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java (with props) incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java (with props) Removed: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java Modified: incubator/lcf/trunk/build.xml incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java Modified: incubator/lcf/trunk/build.xml URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/build.xml (original) +++ incubator/lcf/trunk/build.xml Wed Dec 28 17:34:27 2011 @@ -2401,6 +2401,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java (original) +++ incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/HTMLTester.java Wed Dec 28 17:34:27 2011 @@ -223,7 +223,10 @@ public class HTMLTester throws Exception { String windowVar = getNextVariableName(); - emitLine(windowVar + " = " + virtualBrowserVarName + ".find_window("+windowName.getVarName()+")"); + if (windowName != null) + emitLine(windowVar + " = " + virtualBrowserVarName + ".find_window("+windowName.getVarName()+")"); + else + emitLine(windowVar + " = " + virtualBrowserVarName + ".find_window("+quotePythonString("")+")"); return new Window(windowVar); } Modified: incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py (original) +++ incubator/lcf/trunk/framework/core/src/test/resource/org/apache/manifoldcf/core/tests/VirtualBrowser.py Wed Dec 28 17:34:27 2011 @@ -23,6 +23,7 @@ import HTMLParser import base64 import re import os +import sys # Class that describes answers to pop-up dialog boxes that may occur as a result of clicking a link # or button. If the answer is not found, this is considered a test error, and an exception is thrown! @@ -1060,7 +1061,7 @@ class VirtualBrowser: # Read a url with get. Returns the data as a string. def fetch_data_with_get( self, url ): - print "Getting url '%s'..." % url + print >> sys.stderr, "Getting url '%s'..." % url req = urllib2.Request( url ) if self.username != None: base64string = base64.encodestring('%s:%s' % (self.username, self.password))[:-1] Modified: incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp (original) +++ incubator/lcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp Wed Dec 28 17:34:27 2011 @@ -31,7 +31,7 @@

<%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Outputs")%>

<%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Authorities")%>

@@ -69,10 +69,8 @@
  • <%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.SimpleHistory")%>
    • -
  • <%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.MaximumBandwidth")%> Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/APISanityIT.java Wed Dec 28 17:34:27 2011 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** This is a very basic sanity check */ -public class APISanityIT extends Base +public class APISanityIT extends BaseDerby { @Before Copied: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java (from r1225189, incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java) URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java?p2=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java&p1=incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java&r1=1225189&r2=1225244&rev=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/Base.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseDerby.java Wed Dec 28 17:34:27 2011 @@ -39,7 +39,7 @@ import org.apache.commons.httpclient.*; import org.apache.commons.httpclient.methods.*; /** Tests that run the "agents daemon" should be derived from this */ -public class Base extends org.apache.manifoldcf.crawler.tests.ConnectorBase +public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBase { public static final String agentShutdownSignal = "agent-process"; public static final int testPort = 8346; Added: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java?rev=1225244&view=auto ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java (added) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java Wed Dec 28 17:34:27 2011 @@ -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.filesystem_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.*; + +import org.apache.manifoldcf.core.tests.HTMLTester; + +/** Tests that run the "agents daemon" should be derived from this */ +public class BaseUIDerby extends BaseDerby +{ + protected HTMLTester testerInstance = null; + + @Before + public void setupHTMLTester() + throws Exception + { + testerInstance = new HTMLTester(); + testerInstance.setup(); + } + + @After + public void teardownHTMLTester() + throws Exception + { + if (testerInstance != null) + { + testerInstance.teardown(); + testerInstance = null; + } + } +} Propchange: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/ExpirationIT.java Wed Dec 28 17:34:27 2011 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** This is a test which checks to see if document expiration works properly. */ -public class ExpirationIT extends Base +public class ExpirationIT extends BaseDerby { @Before Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/HopcountIT.java Wed Dec 28 17:34:27 2011 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** This is a test which checks to be sure hopcount functionality is working properly. */ -public class HopcountIT extends Base +public class HopcountIT extends BaseDerby { @Before Added: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java?rev=1225244&view=auto ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java (added) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java Wed Dec 28 17:34:27 2011 @@ -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.filesystem_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.*; + +import org.apache.manifoldcf.core.tests.HTMLTester; + +/** Basic UI navigation tests */ +public class NavigationUI extends BaseUIDerby +{ + + @Test + public void createConnectionsAndJob() + throws Exception + { + testerInstance.newTest(); + HTMLTester.Window window; + HTMLTester.Link link; + window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp",Locale.US); + // Define an output connection via the UI + link = window.findLink(testerInstance.createStringDescription("List output connections")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Add an output connection")); + link.click(); + window = testerInstance.findWindow(null); + + testerInstance.executeTest(); + } + +} Propchange: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUI.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java?rev=1225244&r1=1225243&r2=1225244&view=diff ============================================================================== --- incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java (original) +++ incubator/lcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/SanityIT.java Wed Dec 28 17:34:27 2011 @@ -28,7 +28,7 @@ import java.util.*; import org.junit.*; /** This is a very basic sanity check */ -public class SanityIT extends Base +public class SanityIT extends BaseDerby { @Before