Author: hiranya
Date: Sat Aug 3 06:34:54 2013
New Revision: 1509938
URL: http://svn.apache.org/r1509938
Log:
Adding enrich mediator serialization test
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/EnrichMediatorSerializationTest.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java?rev=1509938&r1=1509937&r2=1509938&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
Sat Aug 3 06:34:54 2013
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMAbstractFactory;
@@ -32,8 +33,8 @@ import org.apache.synapse.mediators.elem
import java.util.Properties;
-
public class EnrichMediatorFactory extends AbstractMediatorFactory {
+
private static final QName XML_Q = new
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "enrich");
private static final QName ATT_PROPERTY = new QName("property");
private static final QName ATT_XPATH = new QName("xpath");
@@ -81,7 +82,7 @@ public class EnrichMediatorFactory exten
private void populateSource(Source source, OMElement sourceEle) {
- // type attribue
+ // type attribute
OMAttribute typeAttr = sourceEle.getAttribute(ATT_TYPE);
if (typeAttr != null && typeAttr.getAttributeValue() != null) {
source.setSourceType(convertTypeToInit(typeAttr.getAttributeValue()));
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java?rev=1509938&r1=1509937&r2=1509938&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
Sat Aug 3 06:34:54 2013
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
@@ -27,7 +28,6 @@ import org.apache.synapse.mediators.elem
import org.apache.synapse.mediators.elementary.Source;
import org.apache.synapse.mediators.elementary.Target;
-
public class EnrichMediatorSerializer extends AbstractMediatorSerializer {
@Override
@@ -56,7 +56,7 @@ public class EnrichMediatorSerializer ex
intTypeToString(source.getSourceType())));
}
- if (source.isClone()) {
+ if (!source.isClone()) {
sourceEle.addAttribute(fac.createOMAttribute("clone", nullNS,
Boolean.toString(source.isClone())));
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java?rev=1509938&r1=1509937&r2=1509938&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java
Sat Aug 3 06:34:54 2013
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.synapse.mediators.elementary;
import org.apache.axiom.om.OMNode;
@@ -52,6 +53,7 @@ import java.util.ArrayList;
*/
public class EnrichMediator extends AbstractMediator {
+
public static final int CUSTOM = 0;
public static final int ENVELOPE = 1;
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/EnrichMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/EnrichMediatorSerializationTest.java?rev=1509938&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/EnrichMediatorSerializationTest.java
(added)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/EnrichMediatorSerializationTest.java
Sat Aug 3 06:34:54 2013
@@ -0,0 +1,131 @@
+/*
+ * 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 EnrichMediatorSerializationTest extends AbstractTestCase {
+
+ private EnrichMediatorFactory factory;
+ private EnrichMediatorSerializer serializer;
+
+ public EnrichMediatorSerializationTest() {
+ super(EnrichMediatorSerializationTest.class.getName());
+ factory = new EnrichMediatorFactory();
+ serializer = new EnrichMediatorSerializer();
+ }
+
+ public void testEnrichMediatorSerializationScenarioOne() throws Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"envelope\"/>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioTwo() throws Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"property\" property=\"p1\"/>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioThree() throws
Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"property\" property=\"p1\"/>" +
+ "<target type=\"property\" property=\"p2\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioFour() throws Exception
{
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"envelope\" clone=\"false\"/>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioFive() throws Exception
{
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source xpath=\"//foo/bar\"/>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioSix() throws Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"property\" property=\"p1\"/>" +
+ "<target xpath=\"//foo/bar\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioSeven() throws
Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"inline\"><foo><bar>text</bar></foo></source>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioEight() throws
Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"inline\">foo</source>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioNine() throws Exception
{
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"inline\" key=\"k1\"/>" +
+ "<target type=\"body\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioTen() throws Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"property\" property=\"p1\"/>" +
+ "<target action=\"child\" xpath=\"//foo/bar\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+
+ public void testEnrichMediatorSerializationScenarioEleven() throws
Exception {
+ String inputXml = "<enrich xmlns=\"http://ws.apache.org/ns/synapse\";>"
+
+ "<source type=\"property\" property=\"p1\"/>" +
+ "<target action=\"sibling\" xpath=\"//foo/bar\"/>" +
+ "</enrich>";
+ assertTrue(serialization(inputXml, factory, serializer));
+ assertTrue(serialization(inputXml, serializer));
+ }
+}
