You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2010/06/09 20:54:59 UTC
svn commit: r953114 - in /webservices/juddi/trunk:
juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/
uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/
uddi-tck-base/src/main/resources/uddi_data/find/
uddi-tck-base/src/main/resources/uddi_d...
Author: kstam
Date: Wed Jun 9 18:54:58 2010
New Revision: 953114
URL: http://svn.apache.org/viewvc?rev=953114&view=rev
Log:
juddi-400, adding testing finding publisherAssertions
Added:
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_sortByName.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisherAssertion2.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/businessEntity.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisher.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisherAssertion.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/tModelKeyGen.xml
webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisherAssertion.xml
Modified:
webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
Modified: webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (original)
+++ webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Wed Jun 9 18:54:58 2010
@@ -98,6 +98,19 @@ public class API_010_PublisherTest {
}
}
/**
+ * Persists Mary Publisher to the database.
+ * @return - true if the published did not exist already,
+ * - false in all other cases.
+ */
+ public boolean saveMaryPublisher() {
+ if (!isExistPublisher(TckPublisher.MARY_PUBLISHER_ID)) {
+ savePublisher(TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_XML);
+ return true;
+ } else {
+ return false;
+ }
+ }
+ /**
* Removes Joe Publisher from the database, this will fail if there
* are child objects attached; think Services etc.
*/
Modified: webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java (original)
+++ webservices/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java Wed Jun 9 18:54:58 2010
@@ -23,6 +23,7 @@ import java.rmi.RemoteException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.juddi.Registry;
import org.apache.juddi.v3.tck.TckBusiness;
+import org.apache.juddi.v3.tck.TckFindEntity;
import org.apache.juddi.v3.tck.TckPublisher;
import org.apache.juddi.v3.tck.TckPublisherAssertion;
import org.apache.juddi.v3.tck.TckSecurity;
@@ -42,8 +43,10 @@ public class API_060_PublisherAssertionT
private static TckTModel tckTModel = new TckTModel(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckPublisherAssertion tckAssertion = new TckPublisherAssertion(new UDDIPublicationImpl());
+ private static TckFindEntity tckFindEntity = new TckFindEntity(new UDDIInquiryImpl());
private static String authInfoJoe = null;
private static String authInfoSam = null;
+ private static String authInfoMary = null;
@BeforeClass
public static void setup() throws ConfigurationException {
@@ -55,6 +58,7 @@ public class API_060_PublisherAssertionT
UDDISecurityPortType security = new UDDISecurityImpl();
authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_CRED);
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
@@ -73,13 +77,74 @@ public class API_060_PublisherAssertionT
tckTModel.saveSamSyndicatorTmodel(authInfoSam);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+ tckAssertion.saveJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
+ } finally {
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ }
+ }
+ /**
+ * This test should find no publisher assertions because we only save them
+ * from the joe publisher side.
+ */
+ @Test
+ public void testFindNoAssertions() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+ tckTModel.saveMaryPublisherTmodel(authInfoMary);
+ tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+ tckBusiness.saveMaryPublisherBusiness(authInfoMary);
+ tckAssertion.saveJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
+
+ tckFindEntity.findRelatedBusiness_sortByName(true);
+
+ tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
+ } finally {
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
+ tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ tckTModel.deleteMaryPublisherTmodel(authInfoMary);
+ }
+ }
+
+ /**
+ * This test should find 2 publisher assertions.
+ */
+ @Test
+ public void testFindAssertions() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+ tckTModel.saveMaryPublisherTmodel(authInfoMary);
+ tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+ tckBusiness.saveMaryPublisherBusiness(authInfoMary);
tckAssertion.saveJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
+ tckAssertion.saveSamPublisherPublisherAssertion(authInfoSam);
+ tckAssertion.saveMaryPublisherPublisherAssertion(authInfoMary);
+
+ tckFindEntity.findRelatedBusiness_sortByName(false);
+
tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
+
} finally {
tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
tckTModel.deleteJoePublisherTmodel(authInfoJoe);
tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ tckTModel.deleteMaryPublisherTmodel(authInfoMary);
}
}
}
Modified: webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Wed Jun 9 18:54:58 2010
@@ -38,6 +38,8 @@ public class TckBusiness
{
final static String JOE_BUSINESS_XML = "uddi_data/joepublisher/businessEntity.xml";
final static String JOE_BUSINESS_KEY = "uddi:uddi.joepublisher.com:businessone";
+ final static String MARY_BUSINESS_XML = "uddi_data/marypublisher/businessEntity.xml";
+ final static String MARY_BUSINESS_KEY = "uddi:uddi.marypublisher.com:marybusinessone";
final static String SAM_BUSINESS_XML = "uddi_data/samsyndicator/businessEntity.xml";
final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
final static String SAM_BUSINESS_KEY = "uddi:www.samco.com:samco";
@@ -77,6 +79,10 @@ public class TckBusiness
saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
}
+ public void saveMaryPublisherBusiness(String authInfoMary) {
+ saveBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
+ }
+
public void updateJoePublisherBusiness(String authInfoJoe) {
updateBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
}
@@ -89,6 +95,10 @@ public class TckBusiness
deleteBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
}
+ public void deleteMaryPublisherBusiness(String authInfoMary) {
+ deleteBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
+ }
+
public void deleteJoePublisherBusinesses(String authInfoJoe, int numberOfCopies) {
deleteBusinesses(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, numberOfCopies);
}
Modified: webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java (original)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java Wed Jun 9 18:54:58 2010
@@ -18,7 +18,9 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.assertNotNull;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.juddi.jaxb.EntityCreator;
import org.apache.log4j.Logger;
@@ -33,9 +35,13 @@ import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.BusinessService;
import org.uddi.api_v3.FindBinding;
import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindRelatedBusinesses;
import org.uddi.api_v3.FindService;
import org.uddi.api_v3.FindTModel;
import org.uddi.api_v3.GetBusinessDetail;
+import org.uddi.api_v3.RelatedBusinessInfo;
+import org.uddi.api_v3.RelatedBusinessInfos;
+import org.uddi.api_v3.RelatedBusinessesList;
import org.uddi.api_v3.ServiceInfo;
import org.uddi.api_v3.ServiceInfos;
import org.uddi.api_v3.ServiceList;
@@ -55,6 +61,7 @@ public class TckFindEntity
{
final static String FIND_BUSINESS_XML = "uddi_data/find/findBusiness1.xml";
final static String FIND_ALL_BUSINESSES_XML = "uddi_data/find/findAllBusinesses.xml";
+ final static String FIND_RELATED_BUSINESS_SORT_BY_NAME_XML = "uddi_data/find/findRelatedBusinesses_sortByName.xml";
final static String FIND_SERVICE_XML = "uddi_data/find/findService1.xml";
final static String FIND_BINDING_XML = "uddi_data/find/findBinding1.xml";
final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml";
@@ -136,6 +143,37 @@ public class TckFindEntity
}
}
+ public void findRelatedBusiness_sortByName(boolean isOneSided) {
+ try {
+ FindRelatedBusinesses body = (FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_SORT_BY_NAME_XML, "org.uddi.api_v3");
+ RelatedBusinessesList result = inquiry.findRelatedBusinesses(body);
+ if (result == null)
+ Assert.fail("Null result from find related business operation");
+ RelatedBusinessInfos bInfos = result.getRelatedBusinessInfos();
+
+ //both parties need to register the assertion for it to be live.
+ if (isOneSided) {
+ Assert.assertNull(bInfos);
+ } else {
+ List<RelatedBusinessInfo> biList = bInfos.getRelatedBusinessInfo();
+ if (bInfos == null)
+ Assert.fail("No result from find related business operation");
+ if (biList == null || biList.size() == 0)
+ Assert.fail("No result from find related business operation");
+ Set<String> keys = new HashSet<String>();
+ for (RelatedBusinessInfo relatedBusinessInfo : biList) {
+ keys.add(relatedBusinessInfo.getBusinessKey());
+ }
+ Assert.assertTrue(keys.contains("uddi:www.samco.com:samco"));
+ Assert.assertTrue(keys.contains("uddi:uddi.marypublisher.com:marybusinessone"));
+ }
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
public void findService() {
try {
FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
Modified: webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Wed Jun 9 18:54:58 2010
@@ -25,4 +25,7 @@ public class TckPublisher
public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
public final static String SAM_SYNDICATOR_ID = "ssyndicator";
public final static String SAM_SYNDICATOR_CRED= "";
+ public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml";
+ public final static String MARY_PUBLISHER_ID = "marypublisher";
+ public final static String MARY_PUBLISHER_CRED = "";
}
\ No newline at end of file
Modified: webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java (original)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java Wed Jun 9 18:54:58 2010
@@ -33,6 +33,9 @@ import org.uddi.v3_service.UDDIPublicati
public class TckPublisherAssertion
{
final static String JOE_ASSERT_XML = "uddi_data/joepublisher/publisherAssertion.xml";
+ final static String MARY_ASSERT_XML = "uddi_data/marypublisher/publisherAssertion.xml";
+ final static String JOE_ASSERT2_XML = "uddi_data/joepublisher/publisherAssertion2.xml";
+ final static String SAM_ASSERT_XML = "uddi_data/samsyndicator/publisherAssertion.xml";
private Logger logger = Logger.getLogger(this.getClass());
private UDDIPublicationPortType publication = null;
@@ -46,9 +49,33 @@ public class TckPublisherAssertion
addPublisherAssertion(authInfoJoe, JOE_ASSERT_XML);
}
+ public void saveSamPublisherPublisherAssertion(String authInfoSam) {
+ addPublisherAssertion(authInfoSam, SAM_ASSERT_XML);
+ }
+
+ public void saveMaryPublisherPublisherAssertion(String authInfoMary) {
+ addPublisherAssertion(authInfoMary, MARY_ASSERT_XML);
+ }
+
+ public void saveJoePublisherPublisherAssertion2(String authInfoJoe) {
+ addPublisherAssertion(authInfoJoe, JOE_ASSERT2_XML);
+ }
+
public void deleteJoePublisherPublisherAssertion(String authInfoJoe) {
deletePublisherAssertion(authInfoJoe, JOE_ASSERT_XML);
}
+
+ public void deleteMaryPublisherPublisherAssertion(String authInfoMary) {
+ deletePublisherAssertion(authInfoMary, MARY_ASSERT_XML);
+ }
+
+ public void deleteSamPublisherPublisherAssertion(String authInfoSam) {
+ deletePublisherAssertion(authInfoSam, SAM_ASSERT_XML);
+ }
+
+ public void deleteJoePublisherPublisherAssertion2(String authInfoJoe) {
+ deletePublisherAssertion(authInfoJoe, JOE_ASSERT2_XML);
+ }
private void addPublisherAssertion(String authInfo, String pubassertXML) {
@@ -62,17 +89,19 @@ public class TckPublisherAssertion
// Now get the entity and check the values
List<PublisherAssertion> paOutList = publication.getPublisherAssertions(authInfo);
- PublisherAssertion paOut = paOutList.get(0);
-
- assertEquals(paIn.getFromKey(), paOut.getFromKey());
- assertEquals(paIn.getToKey(), paOut.getToKey());
-
- KeyedReference keyRefIn = paIn.getKeyedReference();
- KeyedReference keyRefOut = paOut.getKeyedReference();
-
- assertEquals(keyRefIn.getTModelKey(), keyRefOut.getTModelKey());
- assertEquals(keyRefIn.getKeyName(), keyRefOut.getKeyName());
- assertEquals(keyRefIn.getKeyValue(), keyRefOut.getKeyValue());
+ if (paOutList.size()==1) {
+ PublisherAssertion paOut = paOutList.get(0);
+
+ assertEquals(paIn.getFromKey(), paOut.getFromKey());
+ assertEquals(paIn.getToKey(), paOut.getToKey());
+
+ KeyedReference keyRefIn = paIn.getKeyedReference();
+ KeyedReference keyRefOut = paOut.getKeyedReference();
+
+ assertEquals(keyRefIn.getTModelKey(), keyRefOut.getTModelKey());
+ assertEquals(keyRefIn.getKeyName(), keyRefOut.getKeyName());
+ assertEquals(keyRefIn.getKeyValue(), keyRefOut.getKeyValue());
+ }
}
catch(Exception e) {
Modified: webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Wed Jun 9 18:54:58 2010
@@ -36,6 +36,8 @@ public class TckTModel
{
final static String JOE_PUBLISHER_TMODEL_XML = "uddi_data/joepublisher/tModelKeyGen.xml";
final static String JOE_PUBLISHER_TMODEL_KEY = "uddi:uddi.joepublisher.com:keygenerator";
+ final static String MARY_PUBLISHER_TMODEL_XML = "uddi_data/marypublisher/tModelKeyGen.xml";
+ final static String MARY_PUBLISHER_TMODEL_KEY = "uddi:uddi.marypublisher.com:keygenerator";
final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data/samsyndicator/tModelKeyGen.xml";
final static String SAM_SYNDICATOR_TMODEL_KEY = "uddi:www.samco.com:keygenerator";
@@ -109,6 +111,14 @@ public class TckTModel
deleteTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
}
+ public void saveMaryPublisherTmodel(String authInfoMary) {
+ saveTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_PUBLISHER_TMODEL_KEY);
+ }
+
+ public void deleteMaryPublisherTmodel(String authInfoMary) {
+ deleteTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_PUBLISHER_TMODEL_KEY);
+ }
+
public void saveSamSyndicatorTmodel(String authInfoSam) {
saveTModel(authInfoSam, SAM_SYNDICATOR_TMODEL_XML, SAM_SYNDICATOR_TMODEL_KEY);
}
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_sortByName.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_sortByName.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_sortByName.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_sortByName.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,23 @@
+<?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.
+ *
+ */ -->
+<find_relatedBusinesses xmlns="urn:uddi-org:api_v3">
+ <findQualifiers>
+ <findQualifier>sortByNameDesc</findQualifier>
+ </findQualifiers>
+ <businessKey>uddi:uddi.joepublisher.com:businessone</businessKey>
+</find_relatedBusinesses>
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisherAssertion2.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisherAssertion2.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisherAssertion2.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/joepublisher/publisherAssertion2.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,22 @@
+<?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.
+ *
+ */ -->
+<publisherAssertion xmlns="urn:uddi-org:api_v3">
+ <fromKey>uddi:uddi.joepublisher.com:businessone</fromKey>
+ <toKey>uddi:uddi.marypublisher.com:marybusinessone</toKey>
+ <keyedReference tModelKey="uddi:uddi.org:relationships" keyName="Conglomerate" keyValue="parent-child" />
+</publisherAssertion>
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/businessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/businessEntity.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/businessEntity.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/businessEntity.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,33 @@
+<?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.
+ *
+ */ -->
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:uddi.marypublisher.com:marybusinessone">
+ <discoveryURLs>
+ <discoveryURL useType="home">http://www.marybusinessone.com</discoveryURL>
+ <discoveryURL useType="serviceList">http://www.marybusinessone.com/services</discoveryURL>
+ </discoveryURLs>
+ <name xml:lang="en">Mary Doe Enterprises</name>
+ <name xml:lang="es">Maria Negocio Uno</name>
+ <description xml:lang="en">This is the description for Mary Business One.</description>
+ <contacts>
+ <contact useType="administrator">
+ <personName xml:lang="en">Mary Doe</personName>
+ <personName xml:lang="es">Juan Doe</personName>
+ <description xml:lang="en">This is the administrator of the service offerings.</description>
+ </contact>
+ </contacts>
+</businessEntity>
\ No newline at end of file
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisher.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisher.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisher.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,27 @@
+<?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.
+ *
+ */ -->
+<publisher xmlns="urn:juddi-apache-org:api_v3" authorizedName="marypublisher">
+ <publisherName>Mary Publisher</publisherName>
+ <emailAddress>mpublisher@business.com</emailAddress>
+ <isAdmin>true</isAdmin>
+ <isEnabled>True</isEnabled>
+ <maxBindingsPerService>199</maxBindingsPerService>
+ <maxBusinesses>100</maxBusinesses>
+ <maxServicePerBusiness>100</maxServicePerBusiness>
+ <maxTModels>100</maxTModels>
+</publisher>
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisherAssertion.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisherAssertion.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisherAssertion.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/publisherAssertion.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,22 @@
+<?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.
+ *
+ */ -->
+<publisherAssertion xmlns="urn:uddi-org:api_v3">
+ <fromKey>uddi:uddi.joepublisher.com:businessone</fromKey>
+ <toKey>uddi:uddi.marypublisher.com:marybusinessone</toKey>
+ <keyedReference tModelKey="uddi:uddi.org:relationships" keyName="Conglomerate" keyValue="parent-child" />
+</publisherAssertion>
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/tModelKeyGen.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/tModelKeyGen.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/tModelKeyGen.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/marypublisher/tModelKeyGen.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,29 @@
+<?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.
+ *
+ */ -->
+<tModel tModelKey="uddi:uddi.marypublisher.com:keygenerator" xmlns="urn:uddi-org:api_v3">
+ <name>Mary Publisher's Key Generator</name>
+ <description>This is the key generator for Mary Publisher's UDDI entities!</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+</tModel>
Added: webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisherAssertion.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisherAssertion.xml?rev=953114&view=auto
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisherAssertion.xml (added)
+++ webservices/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/publisherAssertion.xml Wed Jun 9 18:54:58 2010
@@ -0,0 +1,22 @@
+<?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.
+ *
+ */ -->
+<publisherAssertion xmlns="urn:uddi-org:api_v3">
+ <fromKey>uddi:uddi.joepublisher.com:businessone</fromKey>
+ <toKey>uddi:www.samco.com:samco</toKey>
+ <keyedReference tModelKey="uddi:uddi.org:relationships" keyName="Holding Company" keyValue="parent-child" />
+</publisherAssertion>
Modified: webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=953114&r1=953113&r2=953114&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ webservices/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Wed Jun 9 18:54:58 2010
@@ -40,8 +40,10 @@ public class UDDI_060_PublisherAssertion
private static TckTModel tckTModel = null;
private static TckBusiness tckBusiness = null;
private static TckPublisherAssertion tckAssertion = null;
+ private static TckFindEntity tckFindEntity = null;
private static String authInfoJoe = null;
private static String authInfoSam = null;
+ private static String authInfoMary = null;
@BeforeClass
public static void setup() throws ConfigurationException {
@@ -58,6 +60,7 @@ public class UDDI_060_PublisherAssertion
UDDISecurityPortType security = transport.getUDDISecurityService();
authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_CRED);
Assert.assertNotNull(authInfoJoe);
Assert.assertNotNull(authInfoSam);
@@ -67,6 +70,7 @@ public class UDDI_060_PublisherAssertion
tckTModel = new TckTModel(publication, inquiry);
tckBusiness = new TckBusiness(publication, inquiry);
tckAssertion = new TckPublisherAssertion(publication);
+ tckFindEntity = new TckFindEntity(inquiry);
} else {
Assert.fail();
}
@@ -100,4 +104,66 @@ public class UDDI_060_PublisherAssertion
tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
}
}
+
+ /**
+ * This test should find no publisher assertions because we only save them
+ * from the joe publisher side.
+ */
+ @Test
+ public void testFindNoAssertions() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+ tckTModel.saveMaryPublisherTmodel(authInfoMary);
+ tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+ tckBusiness.saveMaryPublisherBusiness(authInfoMary);
+ tckAssertion.saveJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
+
+ tckFindEntity.findRelatedBusiness_sortByName(true);
+
+ tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
+ } finally {
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
+ tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ tckTModel.deleteMaryPublisherTmodel(authInfoMary);
+ }
+ }
+
+ /**
+ * This test should find 2 publisher assertions.
+ */
+ @Test
+ public void testFindAssertions() {
+ try {
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+ tckTModel.saveMaryPublisherTmodel(authInfoMary);
+ tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+ tckBusiness.saveMaryPublisherBusiness(authInfoMary);
+ tckAssertion.saveJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
+ tckAssertion.saveSamPublisherPublisherAssertion(authInfoSam);
+ tckAssertion.saveMaryPublisherPublisherAssertion(authInfoMary);
+
+ tckFindEntity.findRelatedBusiness_sortByName(false);
+
+ tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
+ tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
+
+ } finally {
+ tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+ tckBusiness.deleteMaryPublisherBusiness(authInfoMary);
+ tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
+ tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
+ tckTModel.deleteMaryPublisherTmodel(authInfoMary);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org