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 2008/12/21 21:35:07 UTC
svn commit: r728491 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl:
API_020_TmodelTest.java UDDIApiTestHelper.java
Author: kstam
Date: Sun Dec 21 12:35:06 2008
New Revision: 728491
URL: http://svn.apache.org/viewvc?rev=728491&view=rev
Log:
JUDDI-145, adding checking for OverviewDocs on TModels
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java?rev=728491&r1=728490&r2=728491&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java Sun Dec 21 12:35:06 2008
@@ -24,6 +24,7 @@
import org.junit.Test;
import org.uddi.api_v3.DeleteTModel;
import org.uddi.api_v3.GetTModelDetail;
+import org.uddi.api_v3.OverviewDoc;
import org.uddi.api_v3.SaveTModel;
import org.uddi.api_v3.TModel;
import org.uddi.api_v3.TModelDetail;
@@ -115,7 +116,10 @@
assertEquals(tmIn.getName().getValue(), tmOut.getName().getValue());
UDDIApiTestHelper.checkDescriptions(tmIn.getDescription(), tmOut.getDescription());
UDDIApiTestHelper.checkCategories(tmIn.getCategoryBag(), tmOut.getCategoryBag());
-
+ for (OverviewDoc overviewDoc : tmIn.getOverviewDoc()) {
+ UDDIApiTestHelper.checkOverviewDocs(overviewDoc, tmOut.getOverviewDoc());
+ }
+
} catch(Exception e) {
logger.error(e.getMessage(),e);
Assert.fail("No exception should be thrown");
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java?rev=728491&r1=728490&r2=728491&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java Sun Dec 21 12:35:06 2008
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -347,49 +348,67 @@
if (element2.getValue() instanceof org.uddi.api_v3.OverviewDoc) {
OverviewDoc doc2 = (OverviewDoc) element2.getValue();
//match doc1 against this doc2
- boolean descMatch=false;
- boolean urlMatch =false;
- List<JAXBElement<?>> odElem1List = doc1.getContent();
- Iterator<JAXBElement<?>> odElem1 = odElem1List.iterator();
- while (odElem1.hasNext()) {
- JAXBElement<?> odElement1 = odElem1.next();
- if (odElement1.getValue() instanceof org.uddi.api_v3.Description) {
- Description descr1 = (Description) odElement1.getValue();
- List<JAXBElement<?>> odElem2List = doc2.getContent();
- Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
- while (odElem2.hasNext()) {
- JAXBElement<?> odElement2 = odElem2.next();
- if (odElement2.getValue() instanceof org.uddi.api_v3.Description) {
- Description descr2 = (Description) odElement2.getValue();
- if (descr1.getLang().equals(descr2.getLang()) && descr1.getValue().equals(descr2.getValue())) {
- descMatch=true;
- break;
- }
- }
- }
- } else if (odElement1.getValue() instanceof org.uddi.api_v3.OverviewURL) {
- OverviewURL url1 = (OverviewURL) odElement1.getValue();
- List<JAXBElement<?>> odElem2List = doc2.getContent();
- Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
- while (odElem2.hasNext()) {
- JAXBElement<?> odElement2 = odElem2.next();
- if (odElement2.getValue() instanceof org.uddi.api_v3.OverviewURL) {
- OverviewURL url2 = (OverviewURL) odElement2.getValue();
- if (url1.getUseType().equals(url2.getUseType()) && url1.getValue().equals(url2.getValue())) {
- urlMatch=true;
- break;
- }
- }
+ isMatch = compareOverviewDocs(doc1, doc2);
+ if (isMatch) break;
+ }
+ }
+ assertTrue(isMatch);
+ }
+
+ public static void checkOverviewDocs(OverviewDoc doc1, Collection<OverviewDoc> doc2s) {
+ boolean isMatch=false;
+ Iterator<OverviewDoc> docIter = doc2s.iterator();
+ while (docIter.hasNext()) {
+ OverviewDoc doc2 = docIter.next();
+ //match doc1 against this doc2
+ isMatch = compareOverviewDocs(doc1, doc2);
+ if (isMatch) break;
+ }
+ assertTrue(isMatch);
+ }
+
+ public static boolean compareOverviewDocs(OverviewDoc doc1, OverviewDoc doc2)
+ {
+ boolean descMatch=false;
+ boolean urlMatch =false;
+ List<JAXBElement<?>> odElem1List = doc1.getContent();
+ Iterator<JAXBElement<?>> odElem1 = odElem1List.iterator();
+ while (odElem1.hasNext()) {
+ JAXBElement<?> odElement1 = odElem1.next();
+ if (odElement1.getValue() instanceof org.uddi.api_v3.Description) {
+ Description descr1 = (Description) odElement1.getValue();
+ List<JAXBElement<?>> odElem2List = doc2.getContent();
+ Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
+ while (odElem2.hasNext()) {
+ JAXBElement<?> odElement2 = odElem2.next();
+ if (odElement2.getValue() instanceof org.uddi.api_v3.Description) {
+ Description descr2 = (Description) odElement2.getValue();
+ if (descr1.getLang().equals(descr2.getLang()) && descr1.getValue().equals(descr2.getValue())) {
+ descMatch=true;
+ break;
}
}
- if (urlMatch && descMatch) {
- isMatch=true;
- break;
+ }
+ } else if (odElement1.getValue() instanceof org.uddi.api_v3.OverviewURL) {
+ OverviewURL url1 = (OverviewURL) odElement1.getValue();
+ List<JAXBElement<?>> odElem2List = doc2.getContent();
+ Iterator<JAXBElement<?>> odElem2 = odElem2List.iterator();
+ while (odElem2.hasNext()) {
+ JAXBElement<?> odElement2 = odElem2.next();
+ if (odElement2.getValue() instanceof org.uddi.api_v3.OverviewURL) {
+ OverviewURL url2 = (OverviewURL) odElement2.getValue();
+ if (url1.getUseType().equals(url2.getUseType()) && url1.getValue().equals(url2.getValue())) {
+ urlMatch=true;
+ break;
+ }
}
}
}
+ if (urlMatch && descMatch || ( odElem1List.size()==1 && (urlMatch || descMatch)) ) {
+ return true;
+ }
}
- assertTrue(isMatch);
+ return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org