You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2009/05/29 07:55:38 UTC
svn commit: r779853 - in
/webservices/juddi/branches/v3_trunk/uddi-tck/src/main:
java/org/uddi/api_v3/tck/ resources/uddi_data/subscriptionnotifier/
Author: tcunning
Date: Fri May 29 05:55:38 2009
New Revision: 779853
URL: http://svn.apache.org/viewvc?rev=779853&view=rev
Log:
Fix notification test.
Removed:
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/bindingTemplate.xml
Modified:
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java?rev=779853&r1=779852&r2=779853&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriptionListener.java Fri May 29 05:55:38 2009
@@ -19,6 +19,8 @@
import java.util.List;
import java.util.ArrayList;
+import javax.xml.ws.Holder;
+
import org.apache.log4j.Logger;
import org.junit.Assert;
@@ -34,7 +36,9 @@
import org.uddi.api_v3.GetServiceDetail;
import org.uddi.api_v3.SaveService;
import org.uddi.api_v3.ServiceDetail;
+import org.uddi.sub_v3.DeleteSubscription;
import org.uddi.sub_v3.GetSubscriptionResults;
+import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionResultsList;
import org.uddi.subr_v3.NotifySubscriptionListener;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -54,8 +58,8 @@
*/
public class TckSubscriptionListener
{
- public final static String SUBSCRIBED_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
- public final static String SUBSCRIBED_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
+ public final static String SUBSCRIBED_SERVICE_XML = "uddi_data/subscriptionnotifier/businessService.xml";
+ public final static String SUBSCRIBED_SERVICE_KEY = "uddi:uddi.joepublisher.com:notifierone";
final static String JOE_SERVICE_XML = "uddi_data/joepublisher/businessService.xml";
final static String JOE_SERVICE_KEY = "uddi:uddi.joepublisher.com:serviceone";
@@ -86,8 +90,8 @@
super();
this.listener = listener;
this.subscription = subscription;
- this.publication = publication;
this.inquiry = inquiry;
+ this.publication = publication;
}
public void saveNotifierBinding(String authInfo, String bindingXML, String bindingKey) {
@@ -140,9 +144,11 @@
public void changeSubscribedObject(String authInfo) {
try {
- ss.getBusinessService().get(0).getName().get(0).setValue("foo");
+ System.out.println("Name: " +
+ ss.getBusinessService().get(0).getDescription().get(0).getValue());
+ ss.getBusinessService().get(0).getDescription().get(0).setValue("foo");
publication.saveService(ss);
- Thread.sleep(100000);
+ Thread.sleep(10000);
} catch(Exception e) {
e.printStackTrace();
logger.error(e.getMessage(), e);
@@ -150,25 +156,58 @@
}
}
+
+ public void saveNotifierSubscription(String authInfo) {
+ saveSubscription(authInfo, SUBSCRIPTION_XML, SUBSCRIPTION_KEY);
+ }
+
+ public void deleteNotifierSubscription(String authInfo) {
+ deleteSubscription(authInfo, SUBSCRIPTION_KEY);
+ }
- public void notifyService(String authInfo) {
+ private void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) {
try {
+ Subscription subIn = (Subscription)EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
+ List<Subscription> subscriptionList = new ArrayList<Subscription>();
+ subscriptionList.add(subIn);
+ Holder<List<Subscription>> subscriptionHolder = new Holder<List<Subscription>>();
+ subscriptionHolder.value = subscriptionList;
+
+ subscription.saveSubscription(authInfo, subscriptionHolder);
+
+ Subscription subDirectOut = subscriptionHolder.value.get(0);
+ assertEquals(subIn.getSubscriptionKey(), subDirectOut.getSubscriptionKey());
+
+ List<Subscription> outSubscriptionList = subscription.getSubscriptions(authInfo);
+ Assert.assertNotNull(outSubscriptionList);
+ Subscription subOut = outSubscriptionList.get(0);
+
+ assertEquals(subIn.getSubscriptionKey(), subOut.getSubscriptionKey());
+ assertEquals(subDirectOut.getExpiresAfter().getMonth(), subOut.getExpiresAfter().getMonth());
+ assertEquals(subDirectOut.getExpiresAfter().getDay(), subOut.getExpiresAfter().getDay());
+ assertEquals(subDirectOut.getExpiresAfter().getYear(), subOut.getExpiresAfter().getYear());
- NotifySubscriptionListener nsl = new NotifySubscriptionListener();
- nsl.setAuthInfo(authInfo);
- SubscriptionResultsList srl = new SubscriptionResultsList();
+ //assertEquals(subIn.getSubscriptionFilter().getFindService().getName().get(0).getValue(),
+ // subOut.getSubscriptionFilter().getFindService().getName().get(0).getValue());
-// GetSubscriptionResults getSubResultsIn = (GetSubscriptionResults)EntityCreator.buildFromDoc(JOE_SUBSCRIPTIONRESULTS_XML, "org.uddi.sub_v3");
- // getSubResultsIn.setAuthInfo(authInfo);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown");
+ }
+ }
+
+ private void deleteSubscription(String authInfo, String subscriptionKey) {
+ try {
+ // Delete the entity and make sure it is removed
+ DeleteSubscription ds = new DeleteSubscription();
+ ds.setAuthInfo(authInfo);
-// SubscriptionResultsList result = subscription.getSubscriptionResults(getSubResultsIn);
-
- nsl.setSubscriptionResultsList(srl);
+ ds.getSubscriptionKey().add(subscriptionKey);
+ subscription.deleteSubscription(ds);
}
catch(Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown.");
}
-
- }
+ }
}
\ No newline at end of file
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml?rev=779853&r1=779852&r2=779853&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/businessService.xml Fri May 29 05:55:38 2009
@@ -22,9 +22,9 @@
<description xml:lang="en">This is the description of notifier one.</description>
<description xml:lang="es">Ãsta es la descripción del notifier uno.</description>
<bindingTemplates>
-<bindingTemplate xmlns="urn:uddi-org:api_v3" serviceKey="uddi:uddi.joepublisher.com:notifierone" bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
+<bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindingnotifier">
<description xml:lang="en">This is the endpoint for the subscription listener</description>
- <accessPoint useType="endPoint">https://localhost:8080/juddi/services/subscription-listener</accessPoint>
+ <accessPoint useType="endPoint">http://localhost:8880/juddi/services/subscription-listener?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
</tModelInstanceDetails>
Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml?rev=779853&r1=779852&r2=779853&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscriptionnotifier/subscription1.xml Fri May 29 05:55:38 2009
@@ -23,7 +23,7 @@
<findQualifiers>
<findQualifier>exactMatch</findQualifier>
</findQualifiers>
- <name xml:lang="en">Service One</name>
+ <name xml:lang="en">Notifier One</name>
<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org