Author: kstam
Date: Tue Nov 16 19:37:56 2010
New Revision: 1035757
URL: http://svn.apache.org/viewvc?rev=1035757&view=rev
Log:
JUDDI-414 adding unit and tck tests for this jira
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_fromKey.xml
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_toKey.xml
Modified:
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
Modified:
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java?rev=1035757&r1=1035756&r2=1035757&view=diff
==============================================================================
---
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
(original)
+++
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
Tue Nov 16 19:37:56 2010
@@ -103,6 +103,8 @@ public class API_060_PublisherAssertionT
tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
tckFindEntity.findRelatedBusiness_sortByName(true);
+ tckFindEntity.findRelatedBusinessToKey(true);
+ tckFindEntity.findRelatedBusinessFromKey(true);
tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
@@ -134,6 +136,8 @@ public class API_060_PublisherAssertionT
tckAssertion.saveMaryPublisherPublisherAssertion(authInfoMary);
tckFindEntity.findRelatedBusiness_sortByName(false);
+ tckFindEntity.findRelatedBusinessToKey(false);
+ tckFindEntity.findRelatedBusinessFromKey(false);
tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java?rev=1035757&r1=1035756&r2=1035757&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
Tue Nov 16 19:37:56 2010
@@ -65,6 +65,8 @@ 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_RELATED_BUSINESS_FROM_KEY=
"uddi_data/find/findRelatedBusinesses_fromKey.xml";
+ final static String FIND_RELATED_BUSINESS_TO_KEY =
"uddi_data/find/findRelatedBusinesses_toKey.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";
@@ -177,6 +179,66 @@ public class TckFindEntity
}
}
+ public void findRelatedBusinessToKey(boolean isOneSided) {
+ try {
+ FindRelatedBusinesses body =
(FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_TO_KEY,
"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:uddi.joepublisher.com:businessone"));
+ }
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
+ public void findRelatedBusinessFromKey(boolean isOneSided) {
+ try {
+ FindRelatedBusinesses body =
(FindRelatedBusinesses)EntityCreator.buildFromDoc(FIND_RELATED_BUSINESS_FROM_KEY,
"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"));
+ }
+ }
+ catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown.");
+ }
+ }
+
public String findService() {
String serviceKey = null;
try {
Modified:
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java?rev=1035757&r1=1035756&r2=1035757&view=diff
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
(original)
+++
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisherAssertion.java
Tue Nov 16 19:37:56 2010
@@ -23,8 +23,12 @@ import org.apache.log4j.Logger;
import org.junit.Assert;
import org.uddi.api_v3.AddPublisherAssertions;
import org.uddi.api_v3.DeletePublisherAssertions;
+import org.uddi.api_v3.FindRelatedBusinesses;
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.PublisherAssertion;
+import org.uddi.api_v3.RelatedBusinessInfo;
+import org.uddi.api_v3.RelatedBusinessesList;
+import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
/**
* @author <a href="mailto:[email protected]";>Kurt T Stam</a>
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_fromKey.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_fromKey.xml?rev=1035757&view=auto
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_fromKey.xml
(added)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_fromKey.xml
Tue Nov 16 19:37:56 2010
@@ -0,0 +1,20 @@
+<?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">
+ <fromKey>uddi:uddi.joepublisher.com:businessone</fromKey>
+</find_relatedBusinesses>
Added:
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_toKey.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_toKey.xml?rev=1035757&view=auto
==============================================================================
---
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_toKey.xml
(added)
+++
juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/find/findRelatedBusinesses_toKey.xml
Tue Nov 16 19:37:56 2010
@@ -0,0 +1,20 @@
+<?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">
+ <toKey>uddi:www.samco.com:samco</toKey>
+</find_relatedBusinesses>
Modified:
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=1035757&r1=1035756&r2=1035757&view=diff
==============================================================================
---
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
(original)
+++
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
Tue Nov 16 19:37:56 2010
@@ -122,6 +122,8 @@ public class UDDI_060_PublisherAssertion
tckAssertion.saveJoePublisherPublisherAssertion2(authInfoJoe);
tckFindEntity.findRelatedBusiness_sortByName(true);
+ tckFindEntity.findRelatedBusinessToKey(true);
+ tckFindEntity.findRelatedBusinessFromKey(true);
tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
@@ -153,6 +155,8 @@ public class UDDI_060_PublisherAssertion
tckAssertion.saveMaryPublisherPublisherAssertion(authInfoMary);
tckFindEntity.findRelatedBusiness_sortByName(false);
+ tckFindEntity.findRelatedBusinessToKey(false);
+ tckFindEntity.findRelatedBusinessFromKey(false);
tckAssertion.deleteJoePublisherPublisherAssertion(authInfoJoe);
tckAssertion.deleteJoePublisherPublisherAssertion2(authInfoJoe);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
