[savara-commits] savara SVN: r657 - in branches/experimental/2.0.x/bundles: org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl and 1 other directories.
Author: objectiser
Date: 2011-02-11 08:47:44 -0500 (Fri, 11 Feb 2011)
New Revision: 657
Modified:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
Log:
Fix some failing tests related to the contract generation.
Modified:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-11
13:15:20 UTC (rev 656)
+++
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-11
13:47:44 UTC (rev 657)
@@ -307,7 +307,7 @@
public void accept(Interaction interaction) {
// Check if interaction is relevant for the server role
- if (!isRoleRelevant(interaction.getModel().getProtocol().getRole()) &&
+ if (!isRoleRelevant(interaction.enclosingProtocol().getRole()) &&
!isRoleRelevant(interaction.getFromRole()) &&
!isRoleRelevant(interaction.getToRoles())) {
return;
@@ -406,7 +406,7 @@
public boolean start(When when) {
// Check if interaction is relevant for the server role
- if (!isRoleRelevant(when.getModel().getProtocol().getRole()) &&
+ if (!isRoleRelevant(((Choice)when.getParent()).enclosingProtocol().getRole())
&&
!isRoleRelevant(((Choice)when.getParent()).getFromRole()) &&
!isRoleRelevant(((Choice)when.getParent()).getToRole())) {
return(true);
Modified:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java 2011-02-11
13:15:20 UTC (rev 656)
+++
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/impl/ContractIntrospectorTest.java 2011-02-11
13:47:44 UTC (rev 657)
@@ -205,6 +205,8 @@
interaction.setMessageSignature(msig);
interaction.setFromRole(new Role());
+ protocol.getBlock().add(interaction);
+
introspector.accept(interaction);
Contract contract=introspector.getContract();
@@ -265,6 +267,8 @@
annotation.getProperties().put(AnnotationDefinitions.REQUEST_PROPERTY,
"label");
interaction.getAnnotations().add(annotation);
+ protocol.getBlock().add(interaction);
+
introspector.accept(interaction);
Contract contract=introspector.getContract();
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-02-11 13:15:20 UTC
(rev 656)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-02-11 13:47:44 UTC
(rev 657)
@@ -25,6 +25,12 @@
<version>${scribble.version}</version>
</dependency>
<dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.parser</artifactId>
+ <version>${scribble.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.savara.bundles</groupId>
<artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>