Author: pero
Date: Sun Sep 17 11:47:49 2006
New Revision: 447110
URL: http://svn.apache.org/viewvc?view=rev&rev=447110
Log:
Change test case to parse a 1.2.19 jkstatus document
Modified:
tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
Modified:
tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java?view=diff&rev=447110&r1=447109&r2=447110
==============================================================================
---
tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
(original)
+++
tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
Sun Sep 17 11:47:49 2006
@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2004, 2006 The Apache Software Foundation
+ *
+ * Licensed 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.jk.status;
import java.io.IOException;
@@ -17,23 +32,24 @@
public void testDigester() throws IOException, SAXException {
Digester digester = JkStatusParser.createDigester();
String example = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
- + "<jk:status xmlns:jk=\"http://jakarta.apache.org\";>"
- + "<jk:server name=\"localhost\" port=\"80\"
software=\"Apache/2.0.54 (Win32) mod_ssl/2.0.54 OpenSSL/0.9.7g
mod_jk/1.2.13-dev\" version=\"1.2.12\" />"
- + "<jk:balancers>"
- + "<jk:balancer id=\"0\" name=\"lb\" type=\"lb\"
sticky=\"True\" stickyforce=\"False\" retries=\"3\" recover=\"60\" >"
- + "<jk:member id=\"0\" name=\"node1\" type=\"ajp13\"
host=\"localhost\" port=\"9012\" address=\"127.0.0.1:9012\" status=\"OK\"
lbfactor=\"1\" lbvalue=\"1\" elected=\"0\" readed=\"0\" transferred=\"0\"
errors=\"0\" busy=\"0\" />"
- + "<jk:member id=\"1\" name=\"node2\" type=\"ajp13\"
host=\"localhost\" port=\"9022\" address=\"127.0.0.1:9022\" status=\"OK\"
lbfactor=\"1\" lbvalue=\"1\" elected=\"0\" readed=\"0\" transferred=\"0\"
errors=\"0\" busy=\"0\" />"
- + "<jk:map type=\"Wildchar\" uri=\"/ClusterTest/*\"
context=\"/ClusterTest/*\" />"
- + "<jk:map type=\"Exact\" uri=\"/ClusterTest\"
context=\"/ClusterTest\" />"
- + "<jk:map type=\"Wildchar\" uri=\"/myapps/*\"
context=\"/myapps/*\" />"
- + "<jk:map type=\"Exact\" uri=\"/myapps\"
context=\"/myapps\" />"
- + "</jk:balancer>"
- + "</jk:balancers>"
- + "</jk:status>" ;
+ + "<jk:status xmlns:jk=\"http://tomcat.apache.org\";>"
+ + "<jk:server name=\"localhost\" port=\"80\"
software=\"Apache/2.0.58 (Unix) mod_jk/1.2.19\" version=\"1.2.19\" />"
+ + "<jk:balancers>"
+ + "<jk:balancer id=\"0\" name=\"loadbalancer\" type=\"lb\"
sticky=\"True\" stickyforce=\"False\" retries=\"2\" recover=\"60\" >"
+ + "<jk:member id=\"0\" name=\"node1\" type=\"ajp13\"
host=\"localhost\" port=\"9012\" address=\"127.0.0.1:9012\" activation=\"ACT\"
state=\"N/A\" distance=\"0\" lbfactor=\"1\" lbmult=\"1\" lbvalue=\"0\"
elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node1\" />"
+ + "<jk:member id=\"0\" name=\"node2\" type=\"ajp13\"
host=\"localhost\" port=\"9022\" address=\"127.0.0.1:9022\" activation=\"ACT\"
state=\"N/A\" distance=\"0\" lbfactor=\"1\" lbmult=\"1\" lbvalue=\"0\"
elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node2\" />"
+ + "<jk:map type=\"Wildchar\" uri=\"/ClusterTest/*\"
context=\"/ClusterTest/*\" />"
+ + "<jk:map type=\"Exact\" uri=\"/ClusterTest\"
context=\"/ClusterTest\" />"
+ + "<jk:map type=\"Wildchar\" uri=\"/myapps/*\"
context=\"/myapps/*\" />"
+ + "<jk:map type=\"Exact\" uri=\"/myapps\" context=\"/myapps\" />"
+ + "</jk:balancer>"
+ + "</jk:balancers>"
+ + "</jk:status>" ;
+
StringReader reader = new StringReader(example);
JkStatus status = (JkStatus) digester
.parse(reader);
- assertNotNull(status);
+ assertNotNull(status);
assertNotNull(status.getServer());
assertEquals(1,status.getBalancers().size());
JkBalancer balancer = (JkBalancer)status.getBalancers().get(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
