svn commit: r1021837 - in /synapse/trunk/java/modules: core/src/main/java/org/apache/synapse/endpoints/ core/src/test/java/org/apache/synapse/config/xml/endpoints/ extensions/src/test/java/org/apache/synapse/mediators/bsf/

[hiranya]

Author: hiranya
Date: Tue Oct 12 17:01:12 2010
New Revision: 1021837

URL: http://svn.apache.org/viewvc?rev=1021837&view=rev
Log:
* Adding a new serialization test for endpoints
* Enabling an old groovy test


Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
    
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
    
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/GroovyScriptMediatorTest.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java?rev=1021837&r1=1021836&r2=1021837&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointDefinition.java
 Tue Oct 12 17:01:12 2010
@@ -182,7 +182,7 @@ public class EndpointDefinition implemen
     /**
      * Request that RM be turned on/off on this endpoint
      *
-     * @param reliableMessagingOn
+     * @param reliableMessagingOn a boolean flag indicating RM is on or not
      */
     public void setReliableMessagingOn(boolean reliableMessagingOn) {
         this.reliableMessagingOn = reliableMessagingOn;
@@ -200,7 +200,7 @@ public class EndpointDefinition implemen
     /**
      * Request that WS-A be turned on/off on this endpoint
      *
-     * @param addressingOn
+     * @param addressingOn  a boolean flag indicating addressing is on or not
      */
     public void setAddressingOn(boolean addressingOn) {
         this.addressingOn = addressingOn;
@@ -218,7 +218,7 @@ public class EndpointDefinition implemen
     /**
      * Set the addressing namespace version
      *
-     * @param addressingVersion
+     * @param addressingVersion Version of the addressing spec to use
      */
     public void setAddressingVersion(String addressingVersion) {
         this.addressingVersion = addressingVersion;
@@ -236,7 +236,7 @@ public class EndpointDefinition implemen
     /**
      * Request that WS-Sec be turned on/off on this endpoint
      *
-     * @param securityOn
+     * @param securityOn  a boolean flag indicating security is on or not
      */
     public void setSecurityOn(boolean securityOn) {
         this.securityOn = securityOn;

Modified: 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java?rev=1021837&r1=1021836&r2=1021837&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializationTest.java
 Tue Oct 12 17:01:12 2010
@@ -83,4 +83,20 @@ public class AddressEndpointSerializatio
         assertTrue(compare(serializedOut,inputElement));
 
     }
+
+    public void testAddressEndpointScenarioFour() throws Exception {
+         String inputXML =
+                "<endpoint 
xmlns=\"http://synapse.apache.org/ns/2010/04/configuration\";>" +
+                "<address 
uri=\"http://localhost:9000/services/SimpleStockQuoteService\"; >" +
+                "</address>"+
+                "</endpoint>" ;
+
+        OMElement inputElement = createOMElement(inputXML);
+        AddressEndpoint endpoint = (AddressEndpoint) 
AddressEndpointFactory.getEndpointFromElement(
+                inputElement, true, null);
+        assertNotNull(endpoint.getName()); // make sure we generate names for 
anonymous endpoints
+        OMElement serializedOut = 
AddressEndpointSerializer.getElementFromEndpoint(endpoint);
+        // the generated name should not show up in the serialization
+        assertTrue(compare(serializedOut,inputElement));
+    }
 }

Modified: 
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/GroovyScriptMediatorTest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/GroovyScriptMediatorTest.java?rev=1021837&r1=1021836&r2=1021837&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/GroovyScriptMediatorTest.java
 (original)
+++ 
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/GroovyScriptMediatorTest.java
 Tue Oct 12 17:01:12 2010
@@ -20,13 +20,14 @@
 package org.apache.synapse.mediators.bsf;
 
 import junit.framework.TestCase;
+import org.apache.synapse.mediators.TestUtils;
 
 public class GroovyScriptMediatorTest extends TestCase {
 
     public void testXMLMediator2() throws Exception {
-       /* InlineScriptMediator mediator = new 
InlineScriptMediator("javascript","xml.groovy", 
"mc.setPayloadXML(mc.getPayloadXML())");
-        mediator.init();
-        
assertTrue(mediator.mediate(TestUtils.getTestContext("<a><b>petra</b></a>")));*/
+       ScriptMediator mediator = new ScriptMediator("groovy", 
"mc.setPayloadXML(mc.getPayloadXML())");
+       mediator.initInlineScript();
+       
assertTrue(mediator.mediate(TestUtils.getTestContext("<a><b>petra</b></a>")));
     }
 
 // TODO: doesn't work yet