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/10 03:16:04 UTC

svn commit: r763851 - in /webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck: TckSubscriber.java TckSubscription.java

Author: jfaath
Date: Fri Apr 10 01:16:04 2009
New Revision: 763851

URL: http://svn.apache.org/viewvc?rev=763851&view=rev
Log:
create TCK test for saving/deleting subscriptions

Added:
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java   (contents, props changed)
      - copied, changed from r763412, webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java
Removed:
    webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java

Copied: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java (from r763412, webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java?p2=webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java&p1=webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java&r1=763412&r2=763851&rev=763851&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java Fri Apr 10 01:16:04 2009
@@ -19,34 +19,44 @@
 
 import javax.xml.ws.Holder;
 
+import org.apache.log4j.Logger;
 import org.junit.Assert;
-import org.junit.Test;
-import org.uddi.sub_v3.SaveSubscription;
+import org.uddi.sub_v3.DeleteSubscription;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.v3_service.UDDISecurityPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
+import static junit.framework.Assert.assertEquals;
 
 /**
- * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  */
-public class TckSubscriber 
+public class TckSubscription 
 {	
-	final static String SUBSCRIPTION_XML    = "uddi_data/subscription/subscription1.xml";
-	UDDISubscriptionPortType subscription = null;
+	final static String JOE_SUBSCRIPTION_XML = "uddi_data/subscription/subscription1.xml";
+    final static String JOE_SUBSCRIPTION_KEY = "uddi:uddi.joepublisher.com:subscriptionone";
+
+	private Logger logger = Logger.getLogger(this.getClass());
+    UDDISubscriptionPortType subscription = null;
 	UDDISecurityPortType security = null;
 	
-	public TckSubscriber(UDDISubscriptionPortType subscription, UDDISecurityPortType security) {
+	public TckSubscription(UDDISubscriptionPortType subscription, UDDISecurityPortType security) {
 		super();
 		this.subscription = subscription;
 		this.security = security;
 	}
 
-	public void saveSubscription() {
-		try {
-			String authInfo = TckSecurity.getAuthToken(security, "root", "");
+	public void saveJoePublisherSubscription(String authInfoJoe) {
+		saveSubscription(authInfoJoe, JOE_SUBSCRIPTION_XML, JOE_SUBSCRIPTION_KEY);
+	}
 
-			Subscription subIn = (Subscription)EntityCreator.buildFromDoc(SUBSCRIPTION_XML, "org.uddi.sub_v3");
+	public void deleteJoePublisherSubscription(String authInfoJoe) {
+		deleteSubscription(authInfoJoe, JOE_SUBSCRIPTION_KEY);
+	}
+	
+	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>>();
@@ -54,21 +64,30 @@
 			
 			subscription.saveSubscription(authInfo, subscriptionHolder);
 			
+			Subscription subOut = subscriptionHolder.value.get(0);
+			
+			assertEquals(subIn.getSubscriptionKey(), subOut.getSubscriptionKey());
+			
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error(e.getMessage(), e);
 			Assert.fail("No exception should be thrown");		
 		}
+		
 	}
-
-	public void deleteSubscription() {
+	
+	private void deleteSubscription(String authInfo, String subscriptionKey) {
 		try {
-			String authInfo = TckSecurity.getAuthToken(security, "root", "");
-			System.out.println("AUTHINFO=" + authInfo);
+			// Delete the entity and make sure it is removed
+			DeleteSubscription ds = new DeleteSubscription();
+			ds.setAuthInfo(authInfo);
 			
+			ds.getSubscriptionKey().add(subscriptionKey);
+			subscription.deleteSubscription(ds);
 		}
 		catch(Exception e) {
-			e.printStackTrace();
-			Assert.fail("No exception should be thrown");
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown.");
 		}
 	}
+	
 }
\ No newline at end of file

Propchange: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscription.java
------------------------------------------------------------------------------
    svn:mergeinfo = 



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