You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by jf...@apache.org on 2009/04/22 04:24:16 UTC

svn commit: r767351 - in /webservices/juddi/branches/v3_trunk: juddi-core/src/test/java/org/apache/juddi/api/impl/ uddi-tck/src/main/java/org/uddi/api_v3/tck/ uddi-tck/src/main/resources/uddi_data/subscription/

Author: jfaath
Date: Wed Apr 22 02:24:16 2009
New Revision: 767351

URL: http://svn.apache.org/viewvc?rev=767351&view=rev
Log:
updating subscription test

Added:
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml   (with props)
Modified:
    webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java

Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=767351&r1=767350&r2=767351&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java Wed Apr 22 02:24:16 2009
@@ -65,6 +65,7 @@
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			tckBindingTemplate.saveJoePublisherBinding(authInfoJoe);
 			tckSubscription.saveJoePublisherSubscription(authInfoJoe);
+			tckSubscription.getJoePublisherSubscriptionResults(authInfoJoe);
 			tckSubscription.deleteJoePublisherSubscription(authInfoJoe);
 		} 
 		finally {

Modified: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java?rev=767351&r1=767350&r2=767351&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java Wed Apr 22 02:24:16 2009
@@ -21,8 +21,13 @@
 
 import org.apache.log4j.Logger;
 import org.junit.Assert;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.api_v3.ServiceInfos;
 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.v3_service.UDDISecurityPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 import static junit.framework.Assert.assertEquals;
@@ -35,6 +40,9 @@
 {	
 	final static String JOE_SUBSCRIPTION_XML = "uddi_data/subscription/subscription1.xml";
     final static String JOE_SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
+    
+	final static String JOE_SUBSCRIPTIONRESULTS_XML = "uddi_data/subscription/subscriptionresults1.xml";
+
 
 	private Logger logger = Logger.getLogger(this.getClass());
     UDDISubscriptionPortType subscription = null;
@@ -54,6 +62,10 @@
 		deleteSubscription(authInfoJoe, JOE_SUBSCRIPTION_KEY);
 	}
 	
+	public void getJoePublisherSubscriptionResults(String authInfoJoe) {
+		getSubscriptionResults(authInfoJoe, JOE_SUBSCRIPTIONRESULTS_XML);
+	}
+	
 	private void saveSubscription(String authInfo, String subscriptionXML, String subscriptionKey) {
 		try {
 			Subscription subIn = (Subscription)EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
@@ -101,4 +113,33 @@
 		}
 	}
 	
+	private void getSubscriptionResults(String authInfo, String subscriptionResultsXML) {
+		try {
+			GetSubscriptionResults getSubResultsIn = (GetSubscriptionResults)EntityCreator.buildFromDoc(subscriptionResultsXML, "org.uddi.sub_v3");
+			getSubResultsIn.setAuthInfo(authInfo);
+			
+			SubscriptionResultsList result = subscription.getSubscriptionResults(getSubResultsIn);
+			if (result == null)
+				Assert.fail("Null result from getSubscriptionResults operation");
+
+			ServiceInfos sInfos = result.getServiceList().getServiceInfos();
+			if (sInfos == null)
+				Assert.fail("No result from getSubscriptionResults operation");
+			List<ServiceInfo> siList = sInfos.getServiceInfo();
+			if (siList == null || siList.size() == 0)
+				Assert.fail("No result from getSubscriptionResults operation");
+			ServiceInfo siOut = siList.get(0);
+			
+			BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v3");
+
+			assertEquals(bsIn.getServiceKey(), siOut.getServiceKey());
+			
+			TckValidator.checkNames(bsIn.getName(), siOut.getName());
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown");		
+		}
+	}
+	
 }
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml?rev=767351&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml Wed Apr 22 02:24:16 2009
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ */
+-->
+<get_subscriptionResults xmlns="urn:uddi-org:sub_v3">
+  <subscriptionKey>uddi:uddi.joepublisher.com:subscriptionone</subscriptionKey>
+  <coveragePeriod>
+    <startPoint>2009-01-01T00:00:00.000Z</startPoint>
+    <endPoint>2010-01-01T00:00:00.000Z</endPoint>
+  </coveragePeriod>
+</get_subscriptionResults>
\ No newline at end of file

Propchange: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscriptionresults1.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org