Return-Path: 
 <connectors-commits-return-2196-apmail-incubator-connectors-commits-archive=incubator.apache.org@incubator.apache.org>
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 8C4EF9837
	for <apmail-incubator-connectors-commits-archive@minotaur.apache.org>;
 Sat,  7 Jan 2012 20:48:51 +0000 (UTC)
Received: (qmail 24447 invoked by uid 500); 7 Jan 2012 20:48:51 -0000
Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org
Received: (qmail 24406 invoked by uid 500); 7 Jan 2012 20:48:51 -0000
Mailing-List: contact connectors-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:connectors-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:connectors-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:connectors-commits@incubator.apache.org>
List-Id: <connectors-commits.incubator.apache.org>
Reply-To: connectors-dev@incubator.apache.org
Delivered-To: mailing list connectors-commits@incubator.apache.org
Received: (qmail 24399 invoked by uid 99); 7 Jan 2012 20:48:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jan 2012 20:48: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; Sat, 07 Jan 2012 20:48:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E9EBB238899C;
	Sat,  7 Jan 2012 20:48:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1228723 - in /incubator/lcf/trunk:
 connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java
Date: Sat, 07 Jan 2012 20:48:28 -0000
To: connectors-commits@incubator.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120107204828.E9EBB238899C@eris.apache.org>

Author: kwright
Date: Sat Jan  7 20:48:28 2012
New Revision: 1228723

URL: http://svn.apache.org/viewvc?rev=1228723&view=rev
Log:
Finish Solr UI test, and fix a bug in Solr UI.

Modified:
    incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    incubator/lcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java

Modified: incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1228723&r1=1228722&r2=1228723&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original)
+++ incubator/lcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Sat Jan  7 20:48:28 2012
@@ -1177,7 +1177,7 @@ public class SolrConnector extends org.a
 "        <tr class=\"formrow\"><td class=\"formseparator\" colspan=\"3\"><hr/></td></tr>\n"+
 "        <tr class=\"formrow\">\n"+
 "          <td class=\"formcolumncell\">\n"+
-"            <a name=\"argument\"><input type=\"button\" value=\"Add\" alt=\"Add argument\" onclick=\"javascript:addArgument();\"/></a>\n"+
+"            <a name=\"argument\"><input type=\"button\" value=\"Add\" alt=\"Add argument\" onclick=\"javascript:addArgument();\"/>\n"+
 "              <input type=\"hidden\" name=\"argument_count\" value=\""+Integer.toString(i)+"\"/>\n"+
 "              <input type=\"hidden\" name=\"argument_op\" value=\"Continue\"/>\n"+
 "            </a>\n"+

Modified: incubator/lcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java?rev=1228723&r1=1228722&r2=1228723&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java (original)
+++ incubator/lcf/trunk/tests/solr/src/test/java/org/apache/manifoldcf/solr_tests/NavigationDerbyUI.java Sat Jan  7 20:48:28 2012
@@ -70,14 +70,39 @@ public class NavigationDerbyUI extends B
     selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.agents.output.solr.SolrConnector"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next page"));
     button.click();
-    // Visit the Throttling tab
     window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Visit the Throttling tab
     link = window.findLink(testerInstance.createStringDescription("Throttling tab"));
     link.click();
-    // Visit the Solr tabs
-    // MHL
-    // Go back to the Name tab
     window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Visit the Solr tabs - Server first
+    link = window.findLink(testerInstance.createStringDescription("Server tab"));
+    link.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Schema
+    link = window.findLink(testerInstance.createStringDescription("Schema tab"));
+    link.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Arguments
+    link = window.findLink(testerInstance.createStringDescription("Arguments tab"));
+    link.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Documents
+    link = window.findLink(testerInstance.createStringDescription("Documents tab"));
+    link.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Commits
+    link = window.findLink(testerInstance.createStringDescription("Commits tab"));
+    link.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editconnection"));
+    // Go back to the Name tab
     link = window.findLink(testerInstance.createStringDescription("Name tab"));
     link.click();
     // Now save the connection.
@@ -143,11 +168,16 @@ public class NavigationDerbyUI extends B
     selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection"));
     button = window.findButton(testerInstance.createStringDescription("Continue to next screen"));
     button.click();
+    window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
     // Visit all the Solr tabs
-    // MHL
-    
-    // Save the job
+    // Solr Field Mapping
+    link = window.findLink(testerInstance.createStringDescription("Solr Field Mapping tab"));
+    link.click();
     window = testerInstance.findWindow(null);
+    form = window.findForm(testerInstance.createStringDescription("editjob"));
+
+    // Save the job
     button = window.findButton(testerInstance.createStringDescription("Save this job"));
     button.click();