Author: hiranya
Date: Fri Aug 27 08:36:08 2010
New Revision: 990067
URL: http://svn.apache.org/viewvc?rev=990067&view=rev
Log:
More tests and minor bug fix (SYNAPSE-681)
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java?rev=990067&r1=990066&r2=990067&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializer.java
Fri Aug 27 08:36:08 2010
@@ -82,7 +82,7 @@ public class URLRewriteMediatorSerialize
if (a.getValue() != null) {
action.addAttribute("value", a.getValue(), null);
} else if (a.getXpath() != null) {
- action.addAttribute("xpath", a.getValue(), null);
+ action.addAttribute("xpath", a.getXpath().toString(), null);
}
if (a.getRegex() != null) {
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java?rev=990067&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
(added)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/URLRewriteMediatorSerializationTest.java
Fri Aug 27 08:36:08 2010
@@ -0,0 +1,68 @@
+/*
+ * 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.synapse.config.xml;
+
+public class URLRewriteMediatorSerializationTest extends AbstractTestCase {
+
+ private URLRewriteMediatorFactory urlRewriteMediatorFactory = null;
+ private URLRewriteMediatorSerializer urlRewriteMediatorSerializer = null;
+
+ public URLRewriteMediatorSerializationTest() {
+ urlRewriteMediatorFactory = new URLRewriteMediatorFactory();
+ urlRewriteMediatorSerializer = new URLRewriteMediatorSerializer();
+ }
+
+ public void testSerializationScenario1() {
+ String xml = "<rewrite
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";><rule>" +
+ "<action fragment=\"protocol\" value=\"https\"
type=\"set\"/><action " +
+ "fragment=\"host\" value=\"www.test.com\"
type=\"set\"/><action " +
+ "fragment=\"port\" value=\"9090\" type=\"set\"/><action
fragment=\"path\" " +
+ "value=\"/services\" type=\"prepend\"/></rule></rewrite>";
+ assertTrue(serialization(xml, urlRewriteMediatorFactory,
urlRewriteMediatorSerializer));
+ }
+
+ public void testSerializationScenario2() {
+ String xml = "<rewrite
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";>" +
+ "<rule><condition><match xmlns=\"\" type=\"url\"
fragment=\"host\" regex=\"localhost\"/>" +
+ "</condition><action fragment=\"protocol\" value=\"https\"
type=\"set\"/>" +
+ "<action fragment=\"host\" value=\"www.test.com\"
type=\"set\"/><action " +
+ "fragment=\"port\" value=\"9090\" type=\"set\"/><action
fragment=\"path\" " +
+ "value=\"/services\" type=\"prepend\"/></rule>" +
+ "</rewrite>";
+ assertTrue(serialization(xml, urlRewriteMediatorFactory,
urlRewriteMediatorSerializer));
+ }
+
+ public void testSerializationScenario3() {
+ String xml = "<rewrite
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";><rule>" +
+ "<action fragment=\"full\"
value=\"http://localhost:8080/synapse\"; type=\"set\"/></rule>" +
+ "<rule><condition><match xmlns=\"\" type=\"url\"
fragment=\"host\" regex=\"localhost\"/>" +
+ "</condition><action fragment=\"protocol\" value=\"https\"
type=\"set\"/>" +
+ "<action fragment=\"host\" value=\"www.test.com\"
type=\"set\"/>" +
+ "<action fragment=\"port\" xpath=\"get-property('port')\"
type=\"set\"/>" +
+ "<action fragment=\"path\" value=\"/services\"
type=\"prepend\"/></rule><rule>" +
+ "<condition><and xmlns=\"\"><match type=\"url\"
fragment=\"host\" regex=\"www.test.com\"/>" +
+ "<equal type=\"url\" fragment=\"port\"
value=\"9090\"/></and></condition>" +
+ "<action fragment=\"path\" regex=\".*/FooService\"
type=\"replace\" " +
+ "value=\"/BarService\"/></rule>" +
+ "</rewrite>";
+ assertTrue(serialization(xml, urlRewriteMediatorFactory,
urlRewriteMediatorSerializer));
+ }
+
+}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java?rev=990067&r1=990066&r2=990067&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/url/URLRewriteMediatorTest.java
Fri Aug 27 08:36:08 2010
@@ -194,7 +194,8 @@ public class URLRewriteMediatorTest exte
}
public void testFullRewriteScenario1() throws Exception {
- String xml = "<rewrite
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";>\n" +
+ String xml =
+ "<rewrite
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";>\n" +
" <rule>\n" +
" <condition>\n" +
" <and>\n" +
