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/15 06:50:43 UTC
svn commit: r726619 - in /webservices/juddi/branches/v3_trunk/juddi-core/src:
main/java/org/apache/juddi/mapping/ main/java/org/apache/juddi/model/
test/java/org/apache/juddi/api/ test/java/org/apache/juddi/api/impl/
test/java/org/apache/juddi/test/ te...
Author: kstam
Date: Sun Dec 14 21:50:42 2008
New Revision: 726619
URL: http://svn.apache.org/viewvc?rev=726619&view=rev
Log:
JUDDI-142, Restructuring the unittests and fixing the ordering issue.
Added:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (contents, props changed)
- copied, changed from r726475, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherTest.java
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/API_030_BusinessEntityTest.java (contents, props changed)
- copied, changed from r726475, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessEntityTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/package.html
Removed:
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessEntityTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/JUDDITest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/TModelTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/jpublisher-ssyndicator_publisherAssertion.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/jpublisher_Publisher.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/jpublisher_businessEntity1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/jpublisher_businessService1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/jpublisher_tModelKeyGen.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/root_Publisher.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/root_tModelKeyGen.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ssyndicator_Publisher.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ssyndicator_businessEntity1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ssyndicator_businessService1.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/ssyndicator_tModelKeyGen.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/suite-clean.xml
webservices/juddi/branches/v3_trunk/juddi-core/src/test/resources/suite-init.xml
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessServiceTest.java
webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherAssertionTest.java
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/UDDIApiTestHelper.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Sun Dec 14 21:50:42 2008
@@ -69,7 +69,7 @@
public static void mapBusinessNames(List<org.uddi.api_v3.Name> apiNameList,
- Set<org.apache.juddi.model.BusinessName> modelNameList,
+ List<org.apache.juddi.model.BusinessName> modelNameList,
org.apache.juddi.model.BusinessEntity modelBusinessEntity)
throws DispositionReportFaultMessage {
modelNameList.clear();
@@ -80,7 +80,7 @@
}
public static void mapBusinessDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- Set<org.apache.juddi.model.BusinessDescr> modelDescList,
+ List<org.apache.juddi.model.BusinessDescr> modelDescList,
org.apache.juddi.model.BusinessEntity modelBusinessEntity)
throws DispositionReportFaultMessage {
modelDescList.clear();
@@ -91,7 +91,7 @@
}
public static void mapDiscoveryUrls(org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
- Set<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
+ List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
org.apache.juddi.model.BusinessEntity modelBusinessEntity)
throws DispositionReportFaultMessage {
modelDiscUrlList.clear();
@@ -105,7 +105,7 @@
}
public static void mapContacts(org.uddi.api_v3.Contacts apiContacts,
- Set<org.apache.juddi.model.Contact> modelContactList,
+ List<org.apache.juddi.model.Contact> modelContactList,
org.apache.juddi.model.BusinessEntity modelBusinessEntity)
throws DispositionReportFaultMessage {
modelContactList.clear();
@@ -128,7 +128,7 @@
}
public static void mapContactDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- Set<org.apache.juddi.model.ContactDescr> modelDescList,
+ List<org.apache.juddi.model.ContactDescr> modelDescList,
org.apache.juddi.model.Contact modelContact,
String businessKey)
throws DispositionReportFaultMessage {
@@ -140,7 +140,7 @@
}
public static void mapPersonNames(List<org.uddi.api_v3.PersonName> apiPersonNameList,
- Set<org.apache.juddi.model.PersonName> modelPersonNameList,
+ List<org.apache.juddi.model.PersonName> modelPersonNameList,
org.apache.juddi.model.Contact modelContact,
String businessKey)
throws DispositionReportFaultMessage {
@@ -152,7 +152,7 @@
}
public static void mapContactEmails(List<org.uddi.api_v3.Email> apiEmailList,
- Set<org.apache.juddi.model.Email> modelEmailList,
+ List<org.apache.juddi.model.Email> modelEmailList,
org.apache.juddi.model.Contact modelContact,
String businessKey)
throws DispositionReportFaultMessage {
@@ -164,7 +164,7 @@
}
public static void mapContactPhones(List<org.uddi.api_v3.Phone> apiPhoneList,
- Set<org.apache.juddi.model.Phone> modelPhoneList,
+ List<org.apache.juddi.model.Phone> modelPhoneList,
org.apache.juddi.model.Contact modelContact,
String businessKey)
throws DispositionReportFaultMessage {
@@ -176,7 +176,7 @@
}
public static void mapContactAddresses(List<org.uddi.api_v3.Address> apiAddressList,
- Set<org.apache.juddi.model.Address> modelAddressList,
+ List<org.apache.juddi.model.Address> modelAddressList,
org.apache.juddi.model.Contact modelContact,
String businessKey)
throws DispositionReportFaultMessage {
@@ -339,15 +339,15 @@
for (JAXBElement<?> elem : apiCategoryList) {
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
- Set<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
- modelKeyedReferences.clear();
+ List<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
+ //modelKeyedReferences.clear();
org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference)elem.getValue();
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReferenceGroup) {
Set<org.apache.juddi.model.KeyedReferenceGroup> modelKeyedReferenceGroups=modelCategoryBag.getKeyedReferenceGroups();
- modelKeyedReferenceGroups.clear();
+ //modelKeyedReferenceGroups.clear();
org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = (org.uddi.api_v3.KeyedReferenceGroup) elem.getValue();
org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup = new org.apache.juddi.model.KeyedReferenceGroup(modelCategoryBag,apiKeyedReferenceGroup.getTModelKey());
modelKeyedReferenceGroups.add(modelKeyedReferenceGroup);
@@ -441,7 +441,7 @@
}
public static void mapTModelDescriptions(List<org.uddi.api_v3.Description> apiDescList,
- Set<org.apache.juddi.model.TmodelDescr> modelDescList,
+ List<org.apache.juddi.model.TmodelDescr> modelDescList,
org.apache.juddi.model.Tmodel modelTModel)
throws DispositionReportFaultMessage {
modelDescList.clear();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Sun Dec 14 21:50:42 2008
@@ -66,7 +66,7 @@
}
- public static void mapBusinessNames(Set<org.apache.juddi.model.BusinessName> modelNameList,
+ public static void mapBusinessNames(List<org.apache.juddi.model.BusinessName> modelNameList,
List<org.uddi.api_v3.Name> apiNameList)
throws DispositionReportFaultMessage {
apiNameList.clear();
@@ -79,7 +79,7 @@
}
}
- public static void mapBusinessDescriptions(Set<org.apache.juddi.model.BusinessDescr> modelDescList,
+ public static void mapBusinessDescriptions(List<org.apache.juddi.model.BusinessDescr> modelDescList,
List<org.uddi.api_v3.Description> apiDescList)
throws DispositionReportFaultMessage {
apiDescList.clear();
@@ -92,7 +92,7 @@
}
}
- public static void mapDiscoveryUrls(Set<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
+ public static void mapDiscoveryUrls(List<org.apache.juddi.model.DiscoveryUrl> modelDiscUrlList,
org.uddi.api_v3.DiscoveryURLs apiDiscUrls,
org.uddi.api_v3.BusinessEntity apiBusinessEntity)
throws DispositionReportFaultMessage {
@@ -111,7 +111,7 @@
apiBusinessEntity.setDiscoveryURLs(apiDiscUrls);
}
- public static void mapContacts(Set<org.apache.juddi.model.Contact> modelContactList,
+ public static void mapContacts(List<org.apache.juddi.model.Contact> modelContactList,
org.uddi.api_v3.Contacts apiContacts,
org.uddi.api_v3.BusinessEntity apiBusinessEntity)
throws DispositionReportFaultMessage {
@@ -136,7 +136,7 @@
apiBusinessEntity.setContacts(apiContacts);
}
- public static void mapContactDescriptions(Set<org.apache.juddi.model.ContactDescr> modelDescList,
+ public static void mapContactDescriptions(List<org.apache.juddi.model.ContactDescr> modelDescList,
List<org.uddi.api_v3.Description> apiDescList)
throws DispositionReportFaultMessage {
apiDescList.clear();
@@ -149,7 +149,7 @@
}
}
- public static void mapPersonNames(Set<org.apache.juddi.model.PersonName> modelPersonNameList,
+ public static void mapPersonNames(List<org.apache.juddi.model.PersonName> modelPersonNameList,
List<org.uddi.api_v3.PersonName> apiPersonNameList)
throws DispositionReportFaultMessage {
apiPersonNameList.clear();
@@ -162,7 +162,7 @@
}
}
- public static void mapContactEmails(Set<org.apache.juddi.model.Email> modelEmailList,
+ public static void mapContactEmails(List<org.apache.juddi.model.Email> modelEmailList,
List<org.uddi.api_v3.Email> apiEmailList)
throws DispositionReportFaultMessage {
apiEmailList.clear();
@@ -175,7 +175,7 @@
}
}
- public static void mapContactPhones(Set<org.apache.juddi.model.Phone> modelPhoneList,
+ public static void mapContactPhones(List<org.apache.juddi.model.Phone> modelPhoneList,
List<org.uddi.api_v3.Phone> apiPhoneList)
throws DispositionReportFaultMessage {
apiPhoneList.clear();
@@ -188,7 +188,7 @@
}
}
- public static void mapContactAddresses(Set<org.apache.juddi.model.Address> modelAddressList,
+ public static void mapContactAddresses(List<org.apache.juddi.model.Address> modelAddressList,
List<org.uddi.api_v3.Address> apiAddressList)
throws DispositionReportFaultMessage {
apiAddressList.clear();
@@ -451,7 +451,7 @@
org.uddi.api_v3.Name apiName = new org.uddi.api_v3.Name();
apiName.setValue(modelTModel.getName());
apiTModel.setName(apiName);
- apiTModel.setDeleted(modelTModel.isDeleted());
+ apiTModel.setDeleted(modelTModel.getDeleted());
mapTModelDescriptions(modelTModel.getTmodelDescrs(), apiTModel.getDescription());
@@ -462,7 +462,7 @@
}
- public static void mapTModelDescriptions(Set<org.apache.juddi.model.TmodelDescr> modelDescList,
+ public static void mapTModelDescriptions(List<org.apache.juddi.model.TmodelDescr> modelDescList,
List<org.uddi.api_v3.Description> apiDescList)
throws DispositionReportFaultMessage {
apiDescList.clear();
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessCategoryBag.java Sun Dec 14 21:50:42 2008
@@ -30,6 +30,10 @@
private static final long serialVersionUID = 1L;
private BusinessEntity businessEntity;
+ public BusinessCategoryBag() {
+ super();
+ }
+
public BusinessCategoryBag(BusinessEntity businessEntity) {
super();
this.businessEntity = businessEntity;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BusinessEntity.java Sun Dec 14 21:50:42 2008
@@ -15,8 +15,10 @@
* limitations under the License.
*/
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
@@ -39,15 +41,15 @@
private static final long serialVersionUID = 1L;
private UddiEntityPublisher publisher;
- private Set<Contact> contacts = new HashSet<Contact>(0);
+ private List<Contact> contacts = new ArrayList<Contact>(0);
private Set<BusinessIdentifier> businessIdentifiers = new HashSet<BusinessIdentifier>(0);
private Set<PublisherAssertion> publisherAssertionsForFromKey = new HashSet<PublisherAssertion>(0);
- private Set<DiscoveryUrl> discoveryUrls = new HashSet<DiscoveryUrl>(0);
- private Set<BusinessName> businessNames = new HashSet<BusinessName>(0);
+ private List<DiscoveryUrl> discoveryUrls = new ArrayList<DiscoveryUrl>(0);
+ private List<BusinessName> businessNames = new ArrayList<BusinessName>(0);
private Set<PublisherAssertion> publisherAssertionsForToKey = new HashSet<PublisherAssertion>(0);
private BusinessCategoryBag categoryBag;
private Set<BusinessService> businessServices = new HashSet<BusinessService>(0);
- private Set<BusinessDescr> businessDescrs = new HashSet<BusinessDescr>(0);
+ private List<BusinessDescr> businessDescrs = new ArrayList<BusinessDescr>(0);
public BusinessEntity() {
}
@@ -58,14 +60,14 @@
}
public BusinessEntity(String entityKey, String authorizedName,
UddiEntityPublisher publisher, String operator,
- Date lastUpdate, Set<Contact> contacts,
+ Date lastUpdate, List<Contact> contacts,
Set<BusinessIdentifier> businessIdentifiers,
Set<PublisherAssertion> publisherAssertionsForFromKey,
- Set<DiscoveryUrl> discoveryUrls, Set<BusinessName> businessNames,
+ List<DiscoveryUrl> discoveryUrls, List<BusinessName> businessNames,
Set<PublisherAssertion> publisherAssertionsForToKey,
BusinessCategoryBag categoryBag,
Set<BusinessService> businessServices,
- Set<BusinessDescr> businessDescrs) {
+ List<BusinessDescr> businessDescrs) {
this.entityKey = entityKey;
this.publisher = publisher;
this.lastUpdate = lastUpdate;
@@ -91,10 +93,10 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
@OrderBy
- public Set<Contact> getContacts() {
+ public List<Contact> getContacts() {
return this.contacts;
}
- public void setContacts(Set<Contact> contacts) {
+ public void setContacts(List<Contact> contacts) {
this.contacts = contacts;
}
@@ -119,19 +121,19 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
@OrderBy
- public Set<DiscoveryUrl> getDiscoveryUrls() {
+ public List<DiscoveryUrl> getDiscoveryUrls() {
return this.discoveryUrls;
}
- public void setDiscoveryUrls(Set<DiscoveryUrl> discoveryUrls) {
+ public void setDiscoveryUrls(List<DiscoveryUrl> discoveryUrls) {
this.discoveryUrls = discoveryUrls;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
@OrderBy
- public Set<BusinessName> getBusinessNames() {
+ public List<BusinessName> getBusinessNames() {
return this.businessNames;
}
- public void setBusinessNames(Set<BusinessName> businessNames) {
+ public void setBusinessNames(List<BusinessName> businessNames) {
this.businessNames = businessNames;
}
@@ -162,10 +164,10 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "businessEntity")
@OrderBy
- public Set<BusinessDescr> getBusinessDescrs() {
+ public List<BusinessDescr> getBusinessDescrs() {
return this.businessDescrs;
}
- public void setBusinessDescrs(Set<BusinessDescr> businessDescrs) {
+ public void setBusinessDescrs(List<BusinessDescr> businessDescrs) {
this.businessDescrs = businessDescrs;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/CategoryBag.java Sun Dec 14 21:50:42 2008
@@ -15,7 +15,9 @@
* limitations under the License.
*/
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
@@ -27,6 +29,7 @@
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
import javax.persistence.Table;
/**
@@ -40,7 +43,7 @@
private static final long serialVersionUID = 1L;
private Long id;
- private Set<KeyedReference> keyedReferences = new HashSet<KeyedReference>(0);
+ private List<KeyedReference> keyedReferences = new ArrayList<KeyedReference>(0);
private Set<KeyedReferenceGroup> keyedReferenceGroups = new HashSet<KeyedReferenceGroup>(0);
public CategoryBag() {
@@ -57,10 +60,11 @@
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "categoryBag")
- public Set<KeyedReference> getKeyedReferences() {
+ @OrderBy
+ public List<KeyedReference> getKeyedReferences() {
return keyedReferences;
}
- public void setKeyedReferences(Set<KeyedReference> keyedReferences) {
+ public void setKeyedReferences(List<KeyedReference> keyedReferences) {
this.keyedReferences = keyedReferences;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Contact.java Sun Dec 14 21:50:42 2008
@@ -15,7 +15,9 @@
* limitations under the License.
*/
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
@@ -43,11 +45,11 @@
private Long id;
private BusinessEntity businessEntity;
private String useType;
- private Set<PersonName> personNames = new HashSet<PersonName>(0);
- private Set<ContactDescr> contactDescrs = new HashSet<ContactDescr>(0);
- private Set<Email> emails = new HashSet<Email>(0);
- private Set<Phone> phones = new HashSet<Phone>(0);
- private Set<Address> addresses = new HashSet<Address>(0);
+ private List<PersonName> personNames = new ArrayList<PersonName>(0);
+ private List<ContactDescr> contactDescrs = new ArrayList<ContactDescr>(0);
+ private List<Email> emails = new ArrayList<Email>(0);
+ private List<Phone> phones = new ArrayList<Phone>(0);
+ private List<Address> addresses = new ArrayList<Address>(0);
public Contact() {
}
@@ -56,8 +58,8 @@
this.businessEntity = businessEntity;
}
public Contact(BusinessEntity businessEntity, String useType,
- Set<PersonName> personNames, Set<ContactDescr> contactDescrs,
- Set<Email> emails, Set<Phone> phones, Set<Address> addresses) {
+ List<PersonName> personNames, List<ContactDescr> contactDescrs,
+ List<Email> emails, List<Phone> phones, List<Address> addresses) {
this.businessEntity = businessEntity;
this.useType = useType;
this.personNames = personNames;
@@ -95,46 +97,46 @@
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
@OrderBy
- public Set<PersonName> getPersonNames() {
+ public List<PersonName> getPersonNames() {
return this.personNames;
}
- public void setPersonNames(Set<PersonName> personNames) {
+ public void setPersonNames(List<PersonName> personNames) {
this.personNames = personNames;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
@OrderBy
- public Set<ContactDescr> getContactDescrs() {
+ public List<ContactDescr> getContactDescrs() {
return this.contactDescrs;
}
- public void setContactDescrs(Set<ContactDescr> contactDescrs) {
+ public void setContactDescrs(List<ContactDescr> contactDescrs) {
this.contactDescrs = contactDescrs;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
@OrderBy
- public Set<Email> getEmails() {
+ public List<Email> getEmails() {
return this.emails;
}
- public void setEmails(Set<Email> emails) {
+ public void setEmails(List<Email> emails) {
this.emails = emails;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
@OrderBy
- public Set<Phone> getPhones() {
+ public List<Phone> getPhones() {
return this.phones;
}
- public void setPhones(Set<Phone> phones) {
+ public void setPhones(List<Phone> phones) {
this.phones = phones;
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "contact")
@OrderBy
- public Set<Address> getAddresses() {
+ public List<Address> getAddresses() {
return this.addresses;
}
- public void setAddresses(Set<Address> addresses) {
+ public void setAddresses(List<Address> addresses) {
this.addresses = addresses;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java Sun Dec 14 21:50:42 2008
@@ -50,7 +50,7 @@
public KeyedReference(KeyedReferenceGroup keyedReferenceGroup, String tmodelKeyRef,
String keyName, String keyValue) {
- //this.keyedReferenceGroup = keyedReferenceGroup;
+ this.keyedReferenceGroup = keyedReferenceGroup;
this.tmodelKeyRef = tmodelKeyRef;
this.keyName = keyName;
this.keyValue = keyValue;
@@ -58,7 +58,7 @@
public KeyedReference(CategoryBag categoryBag, String tmodelKeyRef,
String keyName, String keyValue) {
- //this.categoryBag = categoryBag;
+ this.categoryBag = categoryBag;
this.tmodelKeyRef = tmodelKeyRef;
this.keyName = keyName;
this.keyValue = keyValue;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Tmodel.java Sun Dec 14 21:50:42 2008
@@ -15,8 +15,10 @@
* limitations under the License.
*/
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
@@ -45,7 +47,7 @@
private String langCode;
private boolean deleted;
private Set<TmodelOverview> overviewDocs = new HashSet<TmodelOverview>(0);
- private Set<TmodelDescr> tmodelDescrs = new HashSet<TmodelDescr>(0);
+ private List<TmodelDescr> tmodelDescrs = new ArrayList<TmodelDescr>(0);
private Set<TmodelDocDescr> tmodelDocDescrs = new HashSet<TmodelDocDescr>(0);
private Set<TmodelIdentifier> tmodelIdentifiers = new HashSet<TmodelIdentifier>(0);
private TmodelCategoryBag categoryBag;
@@ -61,7 +63,7 @@
public Tmodel(String entityKey, String authorizedName, UddiEntityPublisher publisher, String operator,
String name, String langCode, boolean deleted, Date lastUpdate,
Set<TmodelOverview> overviewDocs,
- Set<TmodelDescr> tmodelDescrs, Set<TmodelDocDescr> tmodelDocDescrs,
+ List<TmodelDescr> tmodelDescrs, Set<TmodelDocDescr> tmodelDocDescrs,
Set<TmodelIdentifier> tmodelIdentifiers,
TmodelCategoryBag categoryBag) {
this.entityKey = entityKey;
@@ -103,7 +105,7 @@
}
@Column(name = "deleted")
- public boolean isDeleted() {
+ public boolean getDeleted() {
return deleted;
}
public void setDeleted(boolean deleted) {
@@ -121,10 +123,11 @@
}
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "tmodel")
- public Set<TmodelDescr> getTmodelDescrs() {
+ @OrderBy
+ public List<TmodelDescr> getTmodelDescrs() {
return this.tmodelDescrs;
}
- public void setTmodelDescrs(Set<TmodelDescr> tmodelDescrs) {
+ public void setTmodelDescrs(List<TmodelDescr> tmodelDescrs) {
this.tmodelDescrs = tmodelDescrs;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/TmodelCategoryBag.java Sun Dec 14 21:50:42 2008
@@ -30,6 +30,8 @@
private static final long serialVersionUID = 1L;
private Tmodel tmodel;
+ public TmodelCategoryBag() {}
+
public TmodelCategoryBag(Tmodel tmodel) {
super();
this.tmodel = tmodel;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java Sun Dec 14 21:50:42 2008
@@ -82,8 +82,10 @@
Iterator<KeyGeneratorKey> keyGenItr = keyGeneratorKeys.iterator();
while(keyGenItr.hasNext()) {
KeyGeneratorKey keyGen = keyGenItr.next();
- if (keyGen.getKeygenTModelKey().equalsIgnoreCase(keygenTModelKey))
+ if (keyGen.getKeygenTModelKey().equalsIgnoreCase(keygenTModelKey)) {
+ keyGenItr.remove();
keyGeneratorKeys.remove(keyGen);
+ }
}
}
@@ -100,10 +102,10 @@
if (key == null)
return false;
- String keyPartition = key.substring(0, key.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR) - 1);
+ String keyPartition = key.substring(0, key.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
for (KeyGeneratorKey keyGenKey : keyGeneratorKeys) {
- String keyGenPartition = keyGenKey.getKeygenTModelKey().substring(0, key.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR) - 1);
+ String keyGenPartition = keyGenKey.getKeygenTModelKey().substring(0, key.lastIndexOf(KeyGenerator.PARTITION_SEPARATOR));
if (keyGenPartition.equalsIgnoreCase(keyPartition))
return true;
}
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (from r726475, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherTest.java&r1=726475&r2=726619&rev=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Sun Dec 14 21:50:42 2008
@@ -1,32 +1,79 @@
-package org.apache.juddi.test;
+/*
+ * 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.
+ */
+package org.apache.juddi.api.impl;
-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.testng.Assert;
-import org.testng.annotations.*;
import static junit.framework.Assert.assertEquals;
-import org.apache.juddi.api.datatype.*;
-import org.uddi.v3_service.DispositionReportFaultMessage;
+import java.util.List;
-public class PublisherTest {
+import org.apache.juddi.api.datatype.DeletePublisher;
+import org.apache.juddi.api.datatype.GetPublisherDetail;
+import org.apache.juddi.api.datatype.Publisher;
+import org.apache.juddi.api.datatype.PublisherDetail;
+import org.apache.juddi.api.datatype.SavePublisher;
+import org.apache.juddi.config.Constants;
+import org.apache.juddi.error.InvalidKeyPassedException;
+import org.apache.juddi.test.UDDIApiTestHelper;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class API_010_PublisherTest {
+ final static String JOE_PUBLISHER_XML = "api_xml_data/joepublisher/publisher.xml";
+ final static String JOE_PUBLISHER_ID = "joepublisher";
+ final static String SAM_SYNDICATOR_XML = "api_xml_data/samsyndicator/publisher.xml";
+ final static String SAM_SYNDICATOR_ID = "ssyndicator";
+
+ private Logger logger = Logger.getLogger(this.getClass());
+
private UDDIPublicationImpl publish = new UDDIPublicationImpl();
private UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
- @Parameters({ "sourceDir", "publisherFile", "publisherId" })
@Test
- public void savePublisher(String sourceDir, String publisherFile, String publisherId) {
+ public void joePublisher() {
+ //We can only test this if the publisher is not there already.
+ if (!isExistPublisher(JOE_PUBLISHER_ID)) {
+ savePublisher(JOE_PUBLISHER_ID, JOE_PUBLISHER_XML);
+ deletePublisher(JOE_PUBLISHER_ID);
+ }
+ }
+
+ @Test
+ public void samSyndicator() {
+ //We can only test this if the publisher is not there already.
+ if (!isExistPublisher(SAM_SYNDICATOR_ID)) {
+ savePublisher(SAM_SYNDICATOR_ID, SAM_SYNDICATOR_XML);
+ deletePublisher(SAM_SYNDICATOR_ID);
+ }
+ }
+
+
+ public void savePublisher(String publisherId, String publisherXML) {
try {
- String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ logger.info("Getting auth token..");
+ String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
+ logger.debug("Saving new publisher: " + publisherXML);
SavePublisher sp = new SavePublisher();
sp.setAuthInfo(authInfo);
- Publisher pubIn = (Publisher)UDDIApiTestHelper.buildEntityFromDoc(sourceDir + publisherFile, "org.apache.juddi.api.datatype");
+ Publisher pubIn = (Publisher)UDDIApiTestHelper.buildEntityFromDoc(publisherXML, "org.apache.juddi.api.datatype");
sp.getPublisher().add(pubIn);
publish.savePublisher(sp);
@@ -47,35 +94,63 @@
assertEquals(pubIn.getMaxServicePerBusiness(), pubOut.getMaxServicePerBusiness());
assertEquals(pubIn.getMaxTModels(), pubOut.getMaxTModels());
+ logger.info("Querying for publisher: " + publisherXML);
+ //Querying for this publisher to make sure it's really gone
+ //We're expecting a invalid Key exception at this point.
+ PublisherDetail pdBeforeDelete =null;
+ try {
+ pdBeforeDelete = inquiry.getPublisherDetail(gp);
+ Assert.assertNotNull(pdBeforeDelete);
+ } catch (InvalidKeyPassedException e) {
+ Assert.fail("We expected to find publisher " + publisherXML);
+ }
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown");
}
- catch(DispositionReportFaultMessage dr) {
- Assert.fail("No exception should be thrown", dr);
- }
- catch(JAXBException je) {
- Assert.fail("No exception should be thrown", je);
- }
-
}
-
- @Parameters({ "publisherId" })
- @Test
+
public void deletePublisher(String publisherId) {
try {
- String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ logger.info("Getting auth token..");
+ String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
- // Delete the entity and make sure it is removed
+ logger.info("Delete publisher: " + publisherId);
+ //Now deleting this publisher
DeletePublisher dp = new DeletePublisher();
dp.setAuthInfo(authInfo);
-
dp.getPublisherId().add(publisherId);
- publish.deletePublisher(dp);
- }
- catch(DispositionReportFaultMessage dr) {
- Assert.fail("No exception should be thrown", dr);
+ publish.deletePublisher(dp);
+
+ logger.info("Querying for publisher: " + publisherId + " after deletion.");
+ //Querying for this publisher to make sure it's really gone
+ //We're expecting a invalid Key exception at this point.
+ GetPublisherDetail gp = new GetPublisherDetail();
+ gp.getPublisherId().add(publisherId);
+ PublisherDetail pdAfterDelete =null;
+ try {
+ pdAfterDelete = inquiry.getPublisherDetail(gp);
+ Assert.fail("We did not expect to find this publisher anymore.");
+ } catch (InvalidKeyPassedException e) {
+ Assert.assertNull(pdAfterDelete);
+ }
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("No exception should be thrown");
}
-
}
-
+ public boolean isExistPublisher(String publisherId) {
+ GetPublisherDetail gp = new GetPublisherDetail();
+ gp.getPublisherId().add(publisherId);
+ try {
+ inquiry.getPublisherDetail(gp);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=726619&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java Sun Dec 14 21:50:42 2008
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+package org.apache.juddi.api.impl;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import org.apache.juddi.test.UDDIApiTestHelper;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.Test;
+import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.GetTModelDetail;
+import org.uddi.api_v3.SaveTModel;
+import org.uddi.api_v3.TModel;
+import org.uddi.api_v3.TModelDetail;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class API_020_TmodelTest {
+
+ final static String JOE_PUBLISHER_TMODEL_XML = "api_xml_data/joepublisher/tModelKeyGen.xml";
+ final static String JOE_PUBLISHER_TMODEL_KEY = "uddi:juddi.apache.org:joepublisher:KEYGENERATOR";
+
+ private static UDDIPublicationImpl publish = new UDDIPublicationImpl();
+ private static UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+ private static Logger logger = Logger.getLogger(API_020_TmodelTest.class);
+
+ @Test
+ public void joePublisher() {
+ API_010_PublisherTest api010 = new API_010_PublisherTest();
+ if (!api010.isExistPublisher(API_010_PublisherTest.JOE_PUBLISHER_ID)) {
+ //Add the Publisher
+ api010.savePublisher(API_010_PublisherTest.JOE_PUBLISHER_ID, API_010_PublisherTest.JOE_PUBLISHER_XML);
+ }
+ saveTModel(API_010_PublisherTest.JOE_PUBLISHER_ID, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+ deleteTModel(API_010_PublisherTest.JOE_PUBLISHER_ID, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+ }
+
+ public void saveTModel(String publisherId, String tModelXml, String tModelKey) {
+
+ // Add the tModel
+ try {
+ logger.info("Getting auth token..");
+ String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
+
+ SaveTModel st = new SaveTModel();
+ st.setAuthInfo(authInfo);
+
+ TModel tmIn = (TModel)UDDIApiTestHelper.buildEntityFromDoc(tModelXml, "org.uddi.api_v3");
+ st.getTModel().add(tmIn);
+ publish.saveTModel(st);
+
+ // Now get the entity and check the values
+ GetTModelDetail gt = new GetTModelDetail();
+ gt.getTModelKey().add(tModelKey);
+ TModelDetail td = inquiry.getTModelDetail(gt);
+ List<TModel> tmOutList = td.getTModel();
+ TModel tmOut = tmOutList.get(0);
+
+ assertEquals(tmIn.getTModelKey(), tmOut.getTModelKey());
+ assertEquals(tmIn.getName().getLang(), tmOut.getName().getLang());
+ assertEquals(tmIn.getName().getValue(), tmOut.getName().getValue());
+ UDDIApiTestHelper.checkDescriptions(tmIn.getDescription(), tmOut.getDescription());
+ UDDIApiTestHelper.checkCategories(tmIn.getCategoryBag(), tmOut.getCategoryBag());
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("No exception should be thrown");
+ }
+ }
+
+ public void deleteTModel(String publisherId, String tModelXml, String tModelKey) {
+
+ try {
+ logger.info("Getting auth token..");
+ String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
+ //Now deleting the TModel
+ // Delete the entity and make sure it is removed
+ DeleteTModel dt = new DeleteTModel();
+ dt.setAuthInfo(authInfo);
+
+ dt.getTModelKey().add(tModelKey);
+ publish.deleteTModel(dt);
+ } catch(Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("No exception should be thrown");
+ }
+ }
+}
Copied: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java (from r726475, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessEntityTest.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java?p2=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessEntityTest.java&r1=726475&r2=726619&rev=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessEntityTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java Sun Dec 14 21:50:42 2008
@@ -1,31 +1,72 @@
-package org.apache.juddi.test;
+/*
+ * 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.
+ */
+package org.apache.juddi.api.impl;
-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.testng.Assert;
-import org.testng.annotations.*;
import static junit.framework.Assert.assertEquals;
-import org.uddi.api_v3.*;
-import org.uddi.v3_service.DispositionReportFaultMessage;
+import java.util.List;
-public class BusinessEntityTest {
- private UDDIPublicationImpl publish = new UDDIPublicationImpl();
- private UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+import org.apache.juddi.test.UDDIApiTestHelper;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.junit.Test;
+import org.uddi.api_v3.BusinessDetail;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.DeleteBusiness;
+import org.uddi.api_v3.GetBusinessDetail;
+import org.uddi.api_v3.SaveBusiness;
+
+/**
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ */
+public class API_030_BusinessEntityTest {
+
+ final static String BUSINESS_XML = "api_xml_data/joepublisher/businessEntity.xml";
+ final static String BUSINESS_KEY = "uddi:juddi.apache.org:joepublisher:businessone";
+
+ private static UDDIPublicationImpl publish = new UDDIPublicationImpl();
+ private static UDDIInquiryImpl inquiry = new UDDIInquiryImpl();
+ private static Logger logger = Logger.getLogger(API_030_BusinessEntityTest.class);
- @Parameters({ "sourceDir", "businessFile", "businessKey", "publisherId" })
@Test
- public void saveBusiness(String sourceDir, String businessFile, String businessKey, String publisherId) {
+ public void joePublisher() {
+
+ try {
+ API_010_PublisherTest api010 = new API_010_PublisherTest();
+ if (!api010.isExistPublisher(API_010_PublisherTest.JOE_PUBLISHER_ID)) {
+ //Add the Publisher
+ api010.savePublisher(API_010_PublisherTest.JOE_PUBLISHER_ID, API_010_PublisherTest.JOE_PUBLISHER_XML);
+ }
+ new API_020_TmodelTest().saveTModel(API_010_PublisherTest.JOE_PUBLISHER_ID, API_020_TmodelTest.JOE_PUBLISHER_TMODEL_XML, API_020_TmodelTest.JOE_PUBLISHER_TMODEL_KEY);
+ saveBusiness(API_010_PublisherTest.JOE_PUBLISHER_ID, BUSINESS_XML, BUSINESS_KEY);
+ deleteBusiness(API_010_PublisherTest.JOE_PUBLISHER_ID, BUSINESS_XML, BUSINESS_KEY);
+ } finally {
+ new API_020_TmodelTest().deleteTModel(API_010_PublisherTest.JOE_PUBLISHER_ID, API_020_TmodelTest.JOE_PUBLISHER_TMODEL_XML, API_020_TmodelTest.JOE_PUBLISHER_TMODEL_KEY);
+ }
+ }
+
+
+ public void saveBusiness(String publisherId, String businessXML, String businessKey) {
try {
String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
SaveBusiness sb = new SaveBusiness();
sb.setAuthInfo(authInfo);
- BusinessEntity beIn = (BusinessEntity)UDDIApiTestHelper.buildEntityFromDoc(sourceDir + businessFile, "org.uddi.api_v3");
+ BusinessEntity beIn = (BusinessEntity)UDDIApiTestHelper.buildEntityFromDoc(businessXML, "org.uddi.api_v3");
sb.getBusinessEntity().add(beIn);
publish.saveBusiness(sb);
@@ -43,33 +84,29 @@
UDDIApiTestHelper.checkDiscoveryUrls(beIn.getDiscoveryURLs(), beOut.getDiscoveryURLs());
UDDIApiTestHelper.checkContacts(beIn.getContacts(), beOut.getContacts());
UDDIApiTestHelper.checkCategories(beIn.getCategoryBag(), beOut.getCategoryBag());
- }
- catch(DispositionReportFaultMessage dr) {
- Assert.fail("No exception should be thrown", dr);
- }
- catch(JAXBException je) {
- Assert.fail("No exception should be thrown", je);
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("No exception should be thrown");
}
}
-
- @Parameters({ "businessKey", "publisherId" })
- @Test
- public void deleteBusiness(String businessKey, String publisherId) {
+
+
+ public void deleteBusiness(String publisherId, String businessXML, String businessKey) {
try {
String authInfo = UDDIApiTestHelper.getAuthToken(publisherId);
// Delete the entity and make sure it is removed
DeleteBusiness db = new DeleteBusiness();
db.setAuthInfo(authInfo);
-
db.getBusinessKey().add(businessKey);
publish.deleteBusiness(db);
+
+ } catch(Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("No exception should be thrown");
}
- catch(DispositionReportFaultMessage dr) {
- Assert.fail("No exception should be thrown", dr);
- }
-
- }
+ }
}
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/package.html
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/package.html?rev=726619&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/package.html (added)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/package.html Sun Dec 14 21:50:42 2008
@@ -0,0 +1,11 @@
+Unit tests to test the api implementation. Theses tests go all the way down into
+the persistence layer. By default they are using an embedded Java-based database
+called Derby.
+
+The order in which the tests are run is irrelevant however some tests are more basic
+then others. For example, you will need to have a Publisher, before you can persist
+a Business, and you need to have a Business before you can persist a Service. So it
+makes sense to test persisting a Publisher first.
+
+By default JUnit executes tests in alphabetical order, so to control test execution order we
+use the JUDDI_###_ prefix.
\ No newline at end of file
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessServiceTest.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessServiceTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/BusinessServiceTest.java Sun Dec 14 21:50:42 2008
@@ -50,7 +50,7 @@
catch(DispositionReportFaultMessage dr) {
Assert.fail("No exception should be thrown", dr);
}
- catch(JAXBException je) {
+ catch(Exception je) {
Assert.fail("No exception should be thrown", je);
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherAssertionTest.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherAssertionTest.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherAssertionTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/PublisherAssertionTest.java Sun Dec 14 21:50:42 2008
@@ -45,7 +45,7 @@
catch(DispositionReportFaultMessage dr) {
Assert.fail("No exception should be thrown", dr);
}
- catch(JAXBException je) {
+ catch(Exception je) {
Assert.fail("No exception should be thrown", je);
}
@@ -69,7 +69,7 @@
catch(DispositionReportFaultMessage dr) {
Assert.fail("No exception should be thrown", dr);
}
- catch(JAXBException je) {
+ catch(Exception je) {
Assert.fail("No exception should be thrown", je);
}
Modified: 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=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/SubscriberSaveTest.java Sun Dec 14 21:50:42 2008
@@ -13,6 +13,7 @@
import static junit.framework.Assert.assertEquals;
import org.apache.juddi.api.datatype.*;
+import org.apache.juddi.config.Constants;
import org.uddi.sub_v3.SaveSubscription;
import org.uddi.sub_v3.Subscription;
import org.uddi.v3_service.DispositionReportFaultMessage;
@@ -27,7 +28,7 @@
@Test
public void saveSubscriber(String sourceDir, String subscriptionFile) {
try {
- String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
System.out.println("AUTHINFO=" + authInfo);
SaveSubscription ss = new SaveSubscription();
ss.setAuthInfo(authInfo);
@@ -42,7 +43,7 @@
catch(DispositionReportFaultMessage dr) {
dr.printStackTrace();
Assert.fail("No exception should be thrown", dr);
- } catch (JAXBException e) {
+ } catch (Exception e) {
e.printStackTrace();
Assert.fail("No exception should be thrown", e);
}
@@ -52,7 +53,7 @@
@Test
public void deleteSubscriber(String subscriptionFile) {
try {
- String authInfo = UDDIApiTestHelper.getAuthToken(UDDIApiTestHelper.ROOT_PUBLISHER);
+ String authInfo = UDDIApiTestHelper.getAuthToken(Constants.ROOT_PUBLISHER);
System.out.println("AUTHINFO=" + authInfo);
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java?rev=726619&r1=726618&r2=726619&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/test/UDDIApiTestHelper.java Sun Dec 14 21:50:42 2008
@@ -2,7 +2,9 @@
import static junit.framework.Assert.assertEquals;
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
import java.util.List;
import java.util.Iterator;
@@ -22,18 +24,28 @@
import org.apache.juddi.model.KeyGeneratorKey;
import org.apache.juddi.model.KeyGeneratorKeyId;
import org.apache.juddi.model.UddiEntityPublisher;
+import org.testng.log4testng.Logger;
+import org.testng.v6.Sets;
import org.uddi.api_v3.*;
import org.uddi.v3_service.DispositionReportFaultMessage;
public class UDDIApiTestHelper {
- public static final String ROOT_PUBLISHER = "root";
- public static final String ROOT_PUBLISHER_KEYGEN = "uddi:juddi.apache.org:keygenerator";
-
- public static Object buildEntityFromDoc(String fileName, String thePackage) throws JAXBException {
- JAXBContext jc = JAXBContext.newInstance(thePackage);
- Unmarshaller unmarshaller = jc.createUnmarshaller();
- Object obj = ((JAXBElement)unmarshaller.unmarshal(new File(fileName))).getValue();
+ private static Logger logger = Logger.getLogger(UDDIApiTestHelper.class);
+
+ @SuppressWarnings("unchecked")
+ public static Object buildEntityFromDoc(String fileName, String thePackage) throws JAXBException, IOException {
+ Object obj = null;
+ URL url = Thread.currentThread().getContextClassLoader().getResource(fileName);
+ if (url==null) {
+ logger.error("Could not find resource: " + fileName);
+ } else {
+ InputStream resourceStream =url.openStream();
+
+ JAXBContext jc = JAXBContext.newInstance(thePackage);
+ Unmarshaller unmarshaller = jc.createUnmarshaller();
+ obj = ((JAXBElement)unmarshaller.unmarshal(resourceStream)).getValue();
+ }
return obj;
}
@@ -44,61 +56,6 @@
}
- public static void installRootPublisher(String sourceDir) throws JAXBException, DispositionReportFaultMessage {
- Publisher apiPub = (Publisher)buildEntityFromDoc(sourceDir + "root_Publisher.xml", "org.apache.juddi.api.datatype");
-
- org.apache.juddi.model.Publisher modelPub = new org.apache.juddi.model.Publisher();
-
- MappingApiToModel.mapPublisher(apiPub, modelPub);
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- tx.begin();
-
- em.persist(modelPub);
-
- tx.commit();
- em.close();
-
- }
-
- public static void installRootPublisherKeyGen(String sourceDir) throws JAXBException, DispositionReportFaultMessage {
-
- TModel apiTModel = (TModel)buildEntityFromDoc(sourceDir + "root_tModelKeyGen.xml", "org.uddi.api_v3");
-
- org.apache.juddi.model.Tmodel modelTModel = new org.apache.juddi.model.Tmodel();
-
- MappingApiToModel.mapTModel(apiTModel, modelTModel);
-
- modelTModel.assignAuthorizedName(ROOT_PUBLISHER);
-
- EntityManager em = PersistenceManager.getEntityManager();
- EntityTransaction tx = em.getTransaction();
- tx.begin();
-
- em.persist(modelTModel);
-
- UddiEntityPublisher rootPublisher = em.find(UddiEntityPublisher.class, ROOT_PUBLISHER);
- KeyGeneratorKey keyGenKey = new KeyGeneratorKey();
- keyGenKey.setId(new KeyGeneratorKeyId(rootPublisher.getAuthorizedName(), 0));
- keyGenKey.setPublisher(rootPublisher);
- keyGenKey.setKeygenTModelKey(modelTModel.getEntityKey());
- rootPublisher.getKeyGeneratorKeys().add(keyGenKey);
-
- tx.commit();
- em.close();
-
- }
-
-
- public static void removeRootPublisher() {
- deleteEntity(org.apache.juddi.model.UddiEntityPublisher.class, ROOT_PUBLISHER);
- }
-
- public static void removeRootPublisherKeyGen() {
- deleteEntity(org.apache.juddi.model.Tmodel.class, ROOT_PUBLISHER_KEYGEN);
- }
-
public static void deleteEntity(Class<?> entityClass, Object entityKey) {
EntityManager em = PersistenceManager.getEntityManager();
EntityTransaction tx = em.getTransaction();
@@ -178,6 +135,7 @@
}
List<DiscoveryURL> discList1 = discs1.getDiscoveryURL();
List<DiscoveryURL> discList2 = discs2.getDiscoveryURL();
+
if (discList1 == null || discList2 == null) {
assertEquals(discList1, discList2);
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org