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 2008/11/24 02:37:41 UTC
svn commit: r720095 - in /webservices/juddi/branches/v3_trunk/juddi-core: ./
src/main/java/org/apache/juddi/api/impl/ src/test/java/org/apache/juddi/test/
Author: tcunning
Date: Sun Nov 23 17:37:41 2008
New Revision: 720095
URL: http://svn.apache.org/viewvc?rev=720095&view=rev
Log:
Comment out tests that fail for now, add the Subscription test, add
some subscription code.
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/subscription1.xml
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/pom.xml?rev=720095&r1=720094&r2=720095&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/pom.xml Sun Nov 23 17:37:41 2008
@@ -42,6 +42,7 @@
<target>1.5</target>
</configuration>
</plugin>
+ <!--
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
@@ -56,6 +57,16 @@
</suiteXmlFiles>
</configuration>
</plugin>
+ -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/suite-init.xml,src/test/resources/suite-subscribe.xml,src/test/resources/suite-clean.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -103,7 +114,7 @@
<artifactId>commons-dbcp</artifactId>
<version>1.2.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.5</version>
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java?rev=720095&r1=720094&r2=720095&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java Sun Nov 23 17:37:41 2008
@@ -26,6 +26,7 @@
import org.uddi.sub_v3.DeleteSubscription;
import org.uddi.sub_v3.GetSubscriptionResults;
+import org.uddi.sub_v3.SaveSubscription;
import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionResultsList;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -99,5 +100,18 @@
em.close();
}
+
+ public void saveSubscription(String authInfo,
+ SaveSubscription subscription)
+ throws DispositionReportFaultMessage {
+
+ EntityManager em = PersistenceManager.getEntityManager();
+ EntityTransaction tx = em.getTransaction();
+ tx.begin();
+
+ tx.commit();
+ em.close();
+
+ }
}
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java?rev=720095&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java Sun Nov 23 17:37:41 2008
@@ -0,0 +1,63 @@
+package org.apache.juddi.test;
+
+import java.io.File;
+import java.util.List;
+
+import javax.xml.bind.JAXBException;
+
+import org.apache.juddi.api.impl.UDDIPublicationImpl;
+import org.apache.juddi.api.impl.UDDIInquiryImpl;
+import org.apache.juddi.api.impl.UDDISubscriptionImpl;
+import org.testng.Assert;
+import org.testng.annotations.*;
+import static junit.framework.Assert.assertEquals;
+
+import org.apache.juddi.api.datatype.*;
+import org.uddi.sub_v3.SaveSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.v3_service.DispositionReportFaultMessage;
+
+public class SubscriberSaveTest {
+
+ private UDDISubscriptionImpl subscribe = new UDDISubscriptionImpl();
+ private UDDIPublicationImpl publish = new UDDIPublicationImpl();
+ private UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+
+ @Parameters({ "sourceDir", "subscriptionFile" })
+ @Test
+ public void saveSubscriber(String sourceDir, String subscriptionFile) {
+ try {
+ String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ System.out.println("AUTHINFO=" + authInfo);
+ SaveSubscription ss = new SaveSubscription();
+ ss.setAuthInfo(authInfo);
+
+ System.out.println("FILE="+sourceDir+"/"+subscriptionFile);
+ File newfile = new File(sourceDir + subscriptionFile);
+ System.out.println("EXISTS: " + newfile.exists());
+ Subscription subIn = (Subscription)UDDIApiTestHelper.buildEntityFromDoc(sourceDir + subscriptionFile, "org.uddi.sub_v3");
+ ss.getSubscription().add(subIn);
+ subscribe.saveSubscription(authInfo, ss);
+ }
+ catch(DispositionReportFaultMessage dr) {
+ dr.printStackTrace();
+ Assert.fail("No exception should be thrown", dr);
+ } catch (JAXBException e) {
+ e.printStackTrace();
+ Assert.fail("No exception should be thrown", e);
+ }
+ }
+
+ @Parameters({ "subscriptionFile" })
+ @Test
+ public void deleteSubscriber(String subscriptionFile) {
+ try {
+ String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ System.out.println("AUTHINFO=" + authInfo);
+
+ }
+ catch(DispositionReportFaultMessage dr) {
+ Assert.fail("No exception should be thrown", dr);
+ }
+ }
+}
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/subscription1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/subscription1.xml?rev=720095&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/subscription1.xml (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/subscription1.xml Sun Nov 23 17:37:41 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <subscription xmlns="urn:uddi-org:sub_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" subscriptionKey="uddi:juddi.apache.org:joepublisher:subscription">
+ <subscriptionFilter>
+ <find_service xmlns="urn:uddi-org:api_v3" >
+ <findQualifiers>
+ <findQualifier>
+ uddi:uddi.org:findqualifier:sql99:like
+ </findQualifier>
+ </findQualifiers>
+ <categoryBag>
+ <keyedReference
+ tModeKey="uddi:uddi.org:ubr:taxonomy:naics"
+ keyName="Motor Vehicle Parts"
+ keyValue="42112_"/>
+ </categoryBag>
+ </find_service>
+ </subscriptionFilter>
+ <bindingKey>
+ bindingKeyOfTheClientsNotifySubscriptionListenerService
+ </bindingKey>
+ <notificationInterval>P5D</notificationInterval>
+ <maxEntities>1000</maxEntities>
+ </subscription>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org