You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/09/03 07:22:33 UTC
svn commit: r992209 - in /synapse/trunk/java/modules/core/src:
main/java/org/apache/synapse/startup/quartz/
test/java/org/apache/synapse/config/xml/ test/java/org/apache/synapse/n2n/
test/java/org/apache/synapse/util/ test/java/org/apache/synapse/utils/
Author: ruwan
Date: Fri Sep 3 05:22:33 2010
New Revision: 992209
URL: http://svn.apache.org/viewvc?rev=992209&view=rev
Log:
Test case for the startup serialization and few refactoring in the tests
Added:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java (contents, props changed)
- copied, changed from r992199, synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/Services.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TestTask.java
Removed:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/Services.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java?rev=992209&r1=992208&r2=992209&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartzFactory.java Fri Sep 3 05:22:33 2010
@@ -33,6 +33,7 @@ import org.apache.synapse.task.TaskDescr
/**
* <task class="org.my.synapse.Task" name="string">
+ * <description>description in text</description>
* <property name="stringProp" value="String"/>
* <property name="xmlProp">
* <somexml>config</somexml>
Added: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java?rev=992209&view=auto
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java (added)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/StartupSerializationTest.java Fri Sep 3 05:22:33 2010
@@ -0,0 +1,33 @@
+package org.apache.synapse.config.xml;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.synapse.Startup;
+
+/**
+ *
+ */
+public class StartupSerializationTest extends AbstractTestCase {
+
+ public void testStartupSerializationSenarioOne() throws Exception {
+ String inputXml = "<task class=\"org.apache.synapse.util.TestTask\" group=\"org\" " +
+ "name=\"TestTask\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+ "<property name=\"name\" value=\"foo\"/>" +
+ "<trigger interval=\"5\"/></task>";
+ OMElement inputOM = createOMElement(inputXml);
+ Startup startup = StartupFinder.getInstance().getStartup(inputOM);
+ OMElement resultOM = StartupFinder.getInstance().serializeStartup(null, startup);
+ assertTrue(compare(resultOM, inputOM));
+ }
+
+ public void testStartupSerializationSenarioTwo() throws Exception {
+ String inputXml = "<task class=\"org.apache.synapse.util.TestTask\" group=\"org\" " +
+ "name=\"TestTask\" xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\">" +
+ "<description>Test description</description>" +
+ "<property name=\"name\" value=\"foo\"/>" +
+ "<trigger interval=\"5\"/></task>";
+ OMElement inputOM = createOMElement(inputXml);
+ Startup startup = StartupFinder.getInstance().getStartup(inputOM);
+ OMElement resultOM = StartupFinder.getInstance().serializeStartup(null, startup);
+ assertTrue(compare(resultOM, inputOM));
+ }
+}
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?rev=992209&r1=992208&r2=992209&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java Fri Sep 3 05:22:33 2010
@@ -32,16 +32,13 @@ import org.apache.axis2.context.Configur
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.transport.TransportListener;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.ServerManager;
import org.apache.synapse.ServerConfigurationInformation;
import org.apache.synapse.ServerContextInformation;
import org.apache.synapse.util.xpath.SynapseXPath;
-import org.apache.synapse.utils.Services;
+import org.apache.synapse.util.Services;
import java.util.HashMap;
import java.util.Iterator;
Copied: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java (from r992199, synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/Services.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java?p2=synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java&p1=synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/Services.java&r1=992199&r2=992209&rev=992209&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/utils/Services.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java Fri Sep 3 05:22:33 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.synapse.utils;
+package org.apache.synapse.util;
public class Services {
public int commodity(String commodity) {
Propchange: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/Services.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TestTask.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TestTask.java?rev=992209&view=auto
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TestTask.java (added)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/util/TestTask.java Fri Sep 3 05:22:33 2010
@@ -0,0 +1,51 @@
+/*
+ * 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.util;
+
+import org.apache.synapse.task.Task;
+
+/**
+ * This is a test task used for the respective serialization test case
+ */
+public class TestTask implements Task {
+
+ private String name = "";
+ private String age = "";
+
+ public void execute() {
+ // execute the task
+ }
+
+ public String getAge() {
+ return age;
+ }
+
+ public void setAge(String age) {
+ this.age = age;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}