You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/12/22 21:12:56 UTC
svn commit: r1553019 [1/2] - in /juddi/branches/juddi-3.3.x:
juddi-core-openjpa/src/test/resources/META-INF/
juddi-core/src/main/java/org/apache/juddi/model/
juddi-core/src/test/resources/META-INF/
juddi-examples/hello-world-embedded/src/main/resources...
Author: alexoree
Date: Sun Dec 22 20:12:56 2013
New Revision: 1553019
URL: http://svn.apache.org/r1553019
Log:
JUDDI-583 adding configuration options for enabling load tests, bpel tests, removing empty test class
JUDDI-752 fixed and incorporated into the standard build. TempKeyPK is now public and added to persistence.xml
Added:
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java
Removed:
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_170_ValueSetValidation.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
Modified:
juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties
juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
Modified: juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-core-openjpa/src/test/resources/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java Sun Dec 22 20:12:56 2013
@@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.H
*/
@Embeddable
-class TempKeyPK implements java.io.Serializable {
+public class TempKeyPK implements java.io.Serializable {
private static final long serialVersionUID = 790951819871694597L;
private String entityKey;
Modified: juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-core/src/test/resources/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-examples/hello-world-embedded/src/main/resources/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddi-rest-cxf/src/test/resources/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java (original)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java Sun Dec 22 20:12:56 2013
@@ -18,7 +18,9 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
@@ -44,19 +46,31 @@ public class App {
System.out.println("tck.properties was not found! I give up!");
System.exit(1);
}
+ String s = System.getProperty("uddi.client.xml");
+ if (s == null || !new File(s).exists()) {
+ System.out.println("The value for option -Duddi.client.xml=" + s + " is either null or the file doesn't exist! I give up!");
+ System.exit(1);
+ }
+
JUnitCore junit = new JUnitCore();
- Result result = junit.run(org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
+ List<Class> items = new ArrayList<Class>();
+ items.add(null);
+ Result result = junit.run(
//the bpel tests really only test wsdl to uddi
- // org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
- // org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
+ org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
+ org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
+
org.apache.juddi.v3.tck.JUDDI_010_PublisherIntegrationTest.class,
+
org.apache.juddi.v3.tck.UDDI_010_PublisherIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_020_TmodelIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_030_BusinessEntityIntegrationTest.class,
- //org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadTest.class,
+
+ org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.class,
- //org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadTest.class,
+ org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadIntegrationTest.class,
+
org.apache.juddi.v3.tck.UDDI_050_BindingTemplateIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_060_PublisherAssertionIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_070_FindEntityIntegrationTest.class,
@@ -66,6 +80,7 @@ public class App {
org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoIntegrationTest.class,
+
org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
org.apache.juddi.v3.tck.UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.class,
Modified: juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties (original)
+++ juddi/branches/juddi-3.3.x/juddi-tck-runner/tck.properties Sun Dec 22 20:12:56 2013
@@ -11,6 +11,7 @@ sam.publisher = ssyndicator
sam.password = ssyndicator
mary.publisher = marypublisher
mary.password = marypublisher
+
riftsaw.publisher = riftsaw
riftsaw.password = riftsaw
@@ -31,6 +32,9 @@ rest.enabled = true
vsv.enabled = true
#does the UDDI server support the Subscription API?
sub.enabled=true
+#subscription callback timeouts, in seconds
+sub.timeout=60
+
#does the UDDI server support the Custody Transfer API?
transfer.enabled=true
#does the UDDI server support the Replication API?
@@ -40,6 +44,8 @@ replication.enabled=true
# if the UDDI server supports SMTP based notification
smtp.notify.enabled=true
+
+
#if true, use these settings to verify message delivery/notification
mail.host=localhost
mail.port=110
@@ -48,4 +54,15 @@ mail.port=110
#mail.implicit=false
mail.username=juddi@local.domain
mail.password=da_password1
-mail.to=juddi@local.domain
\ No newline at end of file
+mail.to=juddi@local.domain
+
+# for UDDI server callbacks (subscription api, value set validation)
+# use this to override the bind to address, by default it's the hostname of the computer running the tests from
+#bindaddress=localhost
+
+#include Jboss RiftSaw integration tests = This basically tests the jUDDI clients WSDL 2 UDDI functions and creates a few tModels
+bpel.enabled=true
+
+#load tests
+loadtest.enable=false
+loadtest.maxbusinesses=1100
\ No newline at end of file
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate-JBoss/WEB-INF/classes/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -58,7 +58,8 @@
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
- <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JPA/Hibernate/WEB-INF/classes/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -58,7 +58,8 @@
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
- <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JPA/OpenJPA/WEB-INF/classes/META-INF/persistence.xml Sun Dec 22 20:12:56 2013
@@ -59,6 +59,7 @@
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
<class>org.apache.juddi.model.Tmodel</class>
<class>org.apache.juddi.model.TmodelCategoryBag</class>
<class>org.apache.juddi.model.TmodelDescr</class>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Sun Dec 22 20:12:56 2013
@@ -170,7 +170,7 @@ public class TckBusiness {
beIn.setBusinessKey(businessKey + "-" + i);
sb.getBusinessEntity().add(beIn);
publication.saveBusiness(sb);
- logger.debug("Saved business with key " + businessName + "-" + i);
+ logger.info("Saved business with key " + businessName + "-" + i);
}
} catch (Throwable e) {
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java Sun Dec 22 20:12:56 2013
@@ -72,7 +72,7 @@ public class TckBusinessService
}
public void saveJoePublisherServices(String authInfoJoe, int businessInt, int numberOfCopies) {
- saveServices(authInfoJoe, businessInt, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies);
+ saveServices(authInfoJoe, businessInt, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies, TckBusiness.JOE_BUSINESS_KEY);
}
public void deleteJoePublisherService(String authInfoJoe) {
@@ -101,7 +101,7 @@ public class TckBusinessService
}
public void saveSamSyndicatorServices(String authInfoSam, int businessInt, int numberOfCopies) {
- saveServices(authInfoSam, businessInt, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies);
+ saveServices(authInfoSam, businessInt, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies, TckBusiness.SAM_BUSINESS_KEY);
}
public void deleteSamSyndicatorService(String authInfoSam) {
@@ -112,7 +112,7 @@ public class TckBusinessService
deleteServices(authInfoSam, businessInt, SAM_SERVICE_KEY, numberOfCopies);
}
- public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies) {
+ public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies, String parentBusinessKey) {
SaveService ss = null;
try {
org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v3");
@@ -123,7 +123,7 @@ public class TckBusinessService
ss = new SaveService();
ss.setAuthInfo(authInfo);
bsIn.getName().get(0).setValue(serviceName + "-" + i);
- bsIn.setBusinessKey(TckBusiness.JOE_BUSINESS_KEY + "-" + businessInt);
+ bsIn.setBusinessKey(parentBusinessKey);
bsIn.setServiceKey(serviceKey + "-" + businessInt + "-" + i);
bsIn.getBindingTemplates().getBindingTemplate().get(0).setBindingKey(bindingKey + "-" + businessInt + "-" + i);
bsIn.getBindingTemplates().getBindingTemplate().get(0).setServiceKey(serviceKey + "-" + businessInt + "-" + i);
@@ -135,7 +135,7 @@ public class TckBusinessService
}
publication.saveService(ss);
- logger.debug("Add service with key " + bsIn.getServiceKey());
+ logger.info("Add service with key " + bsIn.getServiceKey());
}
}
catch(Exception e) {
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java Sun Dec 22 20:12:56 2013
@@ -21,15 +21,23 @@ import org.apache.commons.logging.LogFac
import org.uddi.api_v3.BindingTemplates;
import org.uddi.api_v3.BusinessEntity;
import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.BusinessList;
import org.uddi.api_v3.CategoryBag;
import org.uddi.api_v3.Contacts;
import org.uddi.api_v3.DeleteBusiness;
import org.uddi.api_v3.Description;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindQualifiers;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.FindTModel;
import org.uddi.api_v3.KeyedReference;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.ServiceInfos;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModelList;
import org.uddi.sub_v3.DeleteSubscription;
import org.uddi.sub_v3.Subscription;
+import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISubscriptionPortType;
@@ -242,4 +250,79 @@ public class TckCommon {
}
return serialize;
}
+
+
+ public static String DumpAllServices(String authinfo, UDDIInquiryPortType inquiry) {
+ StringBuilder sb = new StringBuilder();
+ FindService fs = new FindService();
+ fs.setAuthInfo(authinfo);
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ fs.getName().add(new Name("%", null));
+ try {
+ ServiceList findService = inquiry.findService(fs);
+ if (findService.getServiceInfos() == null) {
+ return ("NO SERVICES RETURNED!");
+ } else {
+ for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
+ sb.append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getValue()).append(" lang=").append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getLang()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()).append(
+ System.getProperty("line.separator"));
+ }
+ }
+ } catch (Exception ex) {
+ sb.append(ex.getMessage());
+ }
+ return sb.toString();
+ }
+
+
+ public static String DumpAllTModels(String authinfo, UDDIInquiryPortType inquriy) {
+ StringBuilder sb = new StringBuilder();
+ FindTModel fs = new FindTModel();
+ fs.setAuthInfo(authinfo);
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ fs.setName(new Name("%", null));
+ try {
+ TModelList findService = inquriy.findTModel(fs);
+ if (findService.getTModelInfos()== null) {
+ return ("NO TMODELS RETURNED!");
+ } else {
+ for (int i = 0; i < findService.getTModelInfos().getTModelInfo().size(); i++) {
+ sb.append(findService.getTModelInfos().getTModelInfo().get(i).getName().getValue()).
+ append(" lang=").append(findService.getTModelInfos().getTModelInfo().get(i).getName().getLang()).
+ append(" ").append(findService.getTModelInfos().getTModelInfo().get(i).getTModelKey())
+ .append(System.getProperty("line.separator"));
+ }
+ }
+ } catch (Exception ex) {
+ return ex.getMessage();
+ }
+ return sb.toString();
+ }
+ public static String DumpAllBusinesses(String authinfo, UDDIInquiryPortType inquriy) {
+ StringBuilder sb = new StringBuilder();
+ FindBusiness fs = new FindBusiness();
+ fs.setAuthInfo(authinfo);
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+ fs.getName().add(new Name("%", null));
+ try {
+ BusinessList findService = inquriy.findBusiness(fs);
+ if (findService.getBusinessInfos() == null) {
+ return ("NO BUSINESSES RETURNED!");
+ } else {
+ for (int i = 0; i < findService.getBusinessInfos().getBusinessInfo().size(); i++) {
+ sb.append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getValue()).
+ append(" lang=").append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getLang()).
+ append(" ").append(findService.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())
+ .append(System.getProperty("line.separator"));
+ }
+ }
+ } catch (Exception ex) {
+ return ex.getMessage();
+ }
+ return sb.toString();
+ }
+
}
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Sun Dec 22 20:12:56 2013
@@ -176,6 +176,22 @@ public class TckPublisher {
return false;
}
+ public static boolean isLoadTest() {
+ String x = tckProperties.getProperty("loadtest.enable");
+ if (x.equalsIgnoreCase("true")) {
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean isBPEL() {
+ String x = tckProperties.getProperty("bpel.enable");
+ if (x.equalsIgnoreCase("true")) {
+ return true;
+ }
+ return false;
+ }
+
public static int getMaxLoadServices() {
String x = tckProperties.getProperty("loadtest.maxbusinesses");
if (x != null) {
@@ -188,8 +204,26 @@ public class TckPublisher {
return 1100;
}
-
- public static Properties getProperties(){
+
+ public static Properties getProperties() {
return tckProperties;
}
+
+ /**
+ * time in seconds, default is 60
+ *
+ * @return
+ */
+ public static int getSubscriptionTimeout() {
+ String x = tckProperties.getProperty("sub.timeout");
+ if (x != null) {
+ try {
+ return Integer.parseInt(x);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ return 60;
+ }
}
\ No newline at end of file
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties Sun Dec 22 20:12:56 2013
@@ -31,6 +31,9 @@ rest.enabled = true
vsv.enabled = true
#does the UDDI server support the Subscription API?
sub.enabled=true
+#subscription callback timeouts, in seconds
+sub.timeout=60
+
#does the UDDI server support the Custody Transfer API?
transfer.enabled=true
#does the UDDI server support the Replication API?
@@ -53,4 +56,12 @@ mail.to=juddi@local.domain
# for UDDI server callbacks (subscription api, value set validation)
# use this to override the bind to address, by default it's the hostname of the computer running the tests from
-bindaddress=localhost
\ No newline at end of file
+bindaddress=localhost
+
+
+#include Jboss RiftSaw integration tests = This basically tests the jUDDI clients WSDL 2 UDDI functions and creates a few tModels
+bpel.enabled=true
+
+#load tests
+loadtest.enable=true
+loadtest.maxbusinesses=1100
\ No newline at end of file
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoIntegrationTest.java Sun Dec 22 20:12:56 2013
@@ -27,7 +27,6 @@ import org.apache.juddi.api_v3.DeleteCli
import org.apache.juddi.api_v3.DeleteNode;
//import org.apache.juddi.api_v3.GetClientSubscriptionInfoDetail;
import org.apache.juddi.api_v3.Node;
-import org.apache.juddi.api_v3.NodeDetail;
import org.apache.juddi.api_v3.SaveClerkInfo;
import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
import org.apache.juddi.api_v3.SaveNodeInfo;
@@ -39,7 +38,6 @@ import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.uddi.v3_service.DispositionReportFaultMessage;
import org.uddi.v3_service.UDDISecurityPortType;
/**
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Sun Dec 22 20:12:56 2013
@@ -35,13 +35,15 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class UDDI_030_BusinessEntityIntegrationTest {
- private static Log logger = LogFactory.getLog(UDDI_030_BusinessEntityIntegrationTest.class);
+ protected static Log logger = LogFactory.getLog(UDDI_030_BusinessEntityIntegrationTest.class);
protected static TckTModel tckTModelJoe = null;
protected static TckBusiness tckBusinessJoe = null;
protected static TckFindEntity tckFindEntityJoe = null;
protected static TckTModel tckTModelSam = null;
protected static TckBusiness tckBusinessSam = null;
protected static TckFindEntity tckFindEntitySam = null;
+ protected static UDDIInquiryPortType inquiryJoe = null;
+ protected static UDDIInquiryPortType inquirySam = null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
private static UDDIClient manager;
@@ -77,6 +79,7 @@ public class UDDI_030_BusinessEntityInte
tckTModelJoe = new TckTModel(publication, inquiry);
tckBusinessJoe = new TckBusiness(publication, inquiry);
tckFindEntityJoe = new TckFindEntity(inquiry);
+ inquiryJoe = inquiry;
transport = manager.getTransport();
publication = transport.getUDDIPublishService();
@@ -88,7 +91,7 @@ public class UDDI_030_BusinessEntityInte
tckTModelSam = new TckTModel(publication, inquiry);
tckBusinessSam = new TckBusiness(publication, inquiry);
tckFindEntitySam = new TckFindEntity(inquiry);
-
+ inquirySam = inquiry;
String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
transport = manager.getTransport();
@@ -122,7 +125,7 @@ public class UDDI_030_BusinessEntityInte
}
@Test
- public void testJoePublisherBusinessEntity() {
+ public void testJoePublisherBusinessEntity() throws Exception{
try {
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -134,7 +137,7 @@ public class UDDI_030_BusinessEntityInte
}
@Test
- public void testSamSyndicatorBusiness() {
+ public void testSamSyndicatorBusiness() throws Exception{
try {
tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);
Added: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java?rev=1553019&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadIntegrationTest.java Sun Dec 22 20:12:56 2013
@@ -0,0 +1,103 @@
+/*
+ * 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.v3.tck;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.juddi.v3.client.UDDIConstants;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindQualifiers;
+import org.uddi.api_v3.Name;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class UDDI_030_BusinessEntityLoadIntegrationTest extends UDDI_030_BusinessEntityIntegrationTest {
+
+ int numberOfBusinesses = 1100;
+
+ @BeforeClass
+ public static void setup() throws ConfigurationException {
+ UDDI_030_BusinessEntityIntegrationTest.startManager();
+ }
+
+ @Test
+ @Override
+ public void testJoePublisherBusinessEntity() throws Exception {
+ Assume.assumeTrue(TckPublisher.isLoadTest());
+
+ numberOfBusinesses = TckPublisher.getMaxLoadServices();
+ logger.info("UDDI_030_BusinessEntityLoadIntegrationTest testJoePublisherBusinessEntity Load test " + numberOfBusinesses);
+ tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+ long startSave = System.currentTimeMillis();
+ tckBusinessJoe.saveJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
+ long saveDuration = System.currentTimeMillis() - startSave;
+ System.out.println("****************** Save " + numberOfBusinesses + " Joes Duration=" + saveDuration);
+
+ long startFind = System.currentTimeMillis();
+ FindBusiness fs = new FindBusiness();
+ fs.setAuthInfo(authInfoJoe);
+ fs.getName().add(new Name(UDDIConstants.WILDCARD, null));
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ inquiryJoe.findBusiness(fs);
+ long endFind = System.currentTimeMillis() - startFind;
+ logger.info("****************** Find " + numberOfBusinesses + " Joes Business Duration= " + endFind);
+
+ long startDelete = System.currentTimeMillis();
+ tckBusinessJoe.deleteJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
+ long deleteDuration = System.currentTimeMillis() - startDelete;
+ logger.info("****************** Delete " + numberOfBusinesses + " Joes Duration= " + deleteDuration);
+ tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+ Assert.assertTrue("That took way too long at " + endFind, endFind < (5*60*1000));
+ }
+
+ @Test
+ @Override
+ public void testSamSyndicatorBusiness() throws Exception {
+ Assume.assumeTrue(TckPublisher.isLoadTest());
+ logger.info("UDDI_030_BusinessEntityLoadIntegrationTest testSamSyndicatorBusiness Load test " + numberOfBusinesses);
+ numberOfBusinesses = TckPublisher.getMaxLoadServices();
+ tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
+ long startSave = System.currentTimeMillis();
+ tckBusinessSam.saveSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
+ long saveDuration = System.currentTimeMillis() - startSave;
+ logger.info("****************** Save " + numberOfBusinesses + " Sams Duration=" + saveDuration);
+
+ long startFind = System.currentTimeMillis();
+ FindBusiness fs = new FindBusiness();
+ fs.setAuthInfo(authInfoSam);
+ fs.getName().add(new Name(UDDIConstants.WILDCARD, null));
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ inquirySam.findBusiness(fs);
+ long endFind = System.currentTimeMillis() - startFind;
+ logger.info("****************** Find " + numberOfBusinesses + " Sams Business Duration= " + endFind);
+
+
+
+
+ long startDelete = System.currentTimeMillis();
+ tckBusinessSam.deleteSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
+ long deleteDuration = System.currentTimeMillis() - startDelete;
+ logger.info("****************** Delete " + numberOfBusinesses + " Sams Duration= " + deleteDuration);
+ tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
+ Assert.assertTrue("That took way too long at " + endFind, endFind < (5*60*1000));
+ }
+}
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Sun Dec 22 20:12:56 2013
@@ -35,13 +35,15 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class UDDI_040_BusinessServiceIntegrationTest {
- private static Log logger = LogFactory.getLog(UDDI_040_BusinessServiceIntegrationTest.class);
+ protected static Log logger = LogFactory.getLog(UDDI_040_BusinessServiceIntegrationTest.class);
protected static TckTModel tckTModelJoe = null;
protected static TckBusiness tckBusinessJoe = null;
protected static TckBusinessService tckBusinessServiceJoe = null;
protected static TckTModel tckTModelSam = null;
protected static TckBusiness tckBusinessSam = null;
protected static TckBusinessService tckBusinessServiceSam = null;
+ protected static UDDIInquiryPortType inquiryJoe=null;
+ protected static UDDIInquiryPortType inquirySam=null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
private static UDDIClient manager;
@@ -77,6 +79,7 @@ public class UDDI_040_BusinessServiceInt
tckTModelJoe = new TckTModel(publication, inquiry);
tckBusinessJoe = new TckBusiness(publication, inquiry);
tckBusinessServiceJoe = new TckBusinessService(publication, inquiry);
+ inquiryJoe = inquiry;
transport = manager.getTransport();
publication = transport.getUDDIPublishService();
@@ -88,7 +91,7 @@ public class UDDI_040_BusinessServiceInt
tckTModelSam = new TckTModel(publication, inquiry);
tckBusinessSam = new TckBusiness(publication, inquiry);
tckBusinessServiceSam = new TckBusinessService(publication, inquiry);
-
+ inquirySam = inquiry;
transport = manager.getTransport();
publication = transport.getUDDIPublishService();
@@ -109,7 +112,7 @@ public class UDDI_040_BusinessServiceInt
}
@Test
- public void joepublisher() {
+ public void joepublisher() throws Exception {
try {
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -122,7 +125,7 @@ public class UDDI_040_BusinessServiceInt
}
@Test
- public void samsyndicator() {
+ public void samsyndicator() throws Exception {
try {
tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
Added: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java?rev=1553019&view=auto
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java (added)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadIntegrationTest.java Sun Dec 22 20:12:56 2013
@@ -0,0 +1,95 @@
+/*
+ * 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.v3.tck;
+
+import org.apache.juddi.v3.client.UDDIConstants;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+import org.uddi.api_v3.FindQualifiers;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.Name;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
+ */
+public class UDDI_040_BusinessServiceLoadIntegrationTest extends UDDI_040_BusinessServiceIntegrationTest
+{
+ int numberOfServices=1100;
+ @Test @Override
+ public void joepublisher() throws Exception{
+ logger.info("UDDI_040_BusinessServiceLoadIntegrationTest joepublisher Servoce Load test " + numberOfServices);
+ Assume.assumeTrue(TckPublisher.isLoadTest());
+ numberOfServices = TckPublisher.getMaxLoadServices();
+ tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+ tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
+ long startSave = System.currentTimeMillis();
+ tckBusinessServiceJoe.saveJoePublisherServices(authInfoJoe, 0, numberOfServices);
+ long saveDuration = System.currentTimeMillis() - startSave;
+ logger.info("****************** Save " + numberOfServices + " Joes Services Duration=" + saveDuration);
+
+ long startFind=System.currentTimeMillis();
+ FindService fs = new FindService();
+ fs.setAuthInfo(authInfoJoe);
+ fs.getName().add(new Name(UDDIConstants.WILDCARD, null));
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ inquiryJoe.findService(fs);
+ long endFind = System.currentTimeMillis() - startFind;
+ logger.info("****************** Find " + numberOfServices + " Joes Services Duration= " + endFind);
+
+ long startDelete = System.currentTimeMillis();
+ tckBusinessServiceJoe.deleteJoePublisherServices(authInfoJoe, 0, numberOfServices);
+ long deleteDuration = System.currentTimeMillis() - startDelete;
+ logger.info("****************** Delete " + numberOfServices + " Joes Services Duration= " + deleteDuration);
+ tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
+ tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+
+ Assert.assertTrue("That took way too long at " + endFind, endFind < (5*60*1000));
+ }
+
+ @Test @Override
+ public void samsyndicator() throws Exception {
+ Assume.assumeTrue(TckPublisher.isLoadTest());
+ logger.info("UDDI_040_BusinessServiceLoadIntegrationTest samsyndicator Servoce Load test " + numberOfServices);
+ numberOfServices = TckPublisher.getMaxLoadServices();
+ tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
+ tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);
+ long startSave = System.currentTimeMillis();
+ tckBusinessServiceSam.saveSamSyndicatorServices(authInfoSam, 0, numberOfServices);
+ long saveDuration = System.currentTimeMillis() - startSave;
+ logger.info("****************** Save " + numberOfServices + " Sams Services Duration=" + saveDuration);
+
+ long startFind=System.currentTimeMillis();
+ FindService fs = new FindService();
+ fs.setAuthInfo(authInfoSam);
+ fs.getName().add(new Name(UDDIConstants.WILDCARD, null));
+ fs.setFindQualifiers(new FindQualifiers());
+ fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ inquirySam.findService(fs);
+ long endFind = System.currentTimeMillis() - startFind;
+ logger.info("****************** Find " + numberOfServices + " Sams Services Duration= " + endFind);
+
+ long startDelete = System.currentTimeMillis();
+ tckBusinessServiceSam.deleteSamSyndicatorServices(authInfoSam, 0, numberOfServices);
+ long deleteDuration = System.currentTimeMillis() - startDelete;
+ logger.info("****************** Delete " + numberOfServices + " Sams Services Duration= " + deleteDuration);
+ tckBusinessSam.deleteSamSyndicatorBusiness(authInfoSam);
+ tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
+ Assert.assertTrue("That took way too long at " + endFind, endFind < (5*60*1000));
+ }
+
+}
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java?rev=1553019&r1=1553018&r2=1553019&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java Sun Dec 22 20:12:56 2013
@@ -166,7 +166,7 @@ public class UDDI_090_SubscriptionListen
logger.info("joePublisherUpdate_HTTP_FIND_SERVICE");
try {
TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
- String before = DumpAllServices();
+ String before = TckCommon.DumpAllServices(authInfoJoe, inquiryJoe);
UDDISubscriptionListenerImpl.notifcationMap.clear();
UDDISubscriptionListenerImpl.notificationCount = 0;
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
@@ -181,28 +181,27 @@ public class UDDI_090_SubscriptionListen
Thread.sleep(1000);
logger.info("Updating Service ********** ");
tckBusinessServiceJoe.updateJoePublisherService(authInfoJoe, "foo");
-
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
//waiting up to 100 seconds for the listener to notice the change.
- for (int i = 0; i < 60; i++) {
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
Thread.sleep(1000);
-
-
}
if (UDDISubscriptionListenerImpl.notificationCount == 0) {
Assert.fail("No HttpNotification was sent");
}
Iterator<String> iterator = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
- boolean found=false;
- while (iterator.hasNext()){
+ boolean found = false;
+ while (iterator.hasNext()) {
String test = iterator.next();
- if (test.toLowerCase().contains("service one"))
+ if (test.toLowerCase().contains("service one")) {
found = true;
+ }
}
- if (!found){
+ if (!found) {
logger.warn("Test failed, dumping service list");
logger.warn("BEFORE " + before);
- logger.warn("After " + DumpAllServices());
- //if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
+ logger.warn("After " + TckCommon.DumpAllServices(authInfoJoe, inquiryJoe));
+ //if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
Assert.fail("Notification does not contain the correct service");
}
@@ -330,7 +329,7 @@ public class UDDI_090_SubscriptionListen
try {
TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
- String before = DumpAllServices();
+ String before = TckCommon.DumpAllServices(authInfoJoe, inquiryJoe);
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -342,13 +341,14 @@ public class UDDI_090_SubscriptionListen
//Changing the service we subscribed to "JoePublisherService"
Thread.sleep(1000);
logger.info("Updating Service ********** ");
-
+
tckBusinessServiceJoe.updateJoePublisherService(authInfoJoe, "foo");
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
//waiting up to 100 seconds for the listener to notice the change.
boolean received = false;
- for (int i = 0; i < 12; i++) {
- Thread.sleep(5000);
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
System.out.print(".");
if (fetchMail("Service One") > 0) {
logger.info("Received Email Notification");
@@ -356,10 +356,10 @@ public class UDDI_090_SubscriptionListen
break;
}
}
- if (!received){
+ if (!received) {
logger.warn("Test failed, dumping service list");
logger.warn("BEFORE " + before);
- logger.warn("After " + DumpAllServices());
+ logger.warn("After " + TckCommon.DumpAllServices(authInfoJoe, inquiryJoe));
}
Assert.assertTrue("No email was received", received);
@@ -381,7 +381,7 @@ public class UDDI_090_SubscriptionListen
logger.info("joePublisherUpdate_HTTP_FIND_BUSINESS");
try {
TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
- String before = DumpAllBusinesses();
+ String before = TckCommon.DumpAllBusinesses(authInfoJoe, inquiryJoe);
UDDISubscriptionListenerImpl.notifcationMap.clear();
UDDISubscriptionListenerImpl.notificationCount = 0;
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
@@ -400,37 +400,38 @@ public class UDDI_090_SubscriptionListen
Thread.sleep(1000);
logger.info("Saving Mary's Business ********** ");
tckBusinessMary.saveMaryPublisherBusiness(authInfoMary);
-
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
//waiting up to 10 seconds for the listener to notice the change.
- for (int i = 0; i < 20; i++) {
- Thread.sleep(500);
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
System.out.print(".");
if (UDDISubscriptionListenerImpl.notificationCount > 0) {
-
- }
+ }
}
logger.info("RX " + UDDISubscriptionListenerImpl.notificationCount + " notifications");
Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
- boolean found =false;
-
+ boolean found = false;
+
while (it.hasNext()) {
String test = it.next();
- if (TckCommon.isDebug())
- logger.info("Notification: " + test);
- if (test.toLowerCase().contains("marybusinessone"))
+ if (TckCommon.isDebug()) {
+ logger.info("Notification: " + test);
+ }
+ if (test.toLowerCase().contains("marybusinessone")) {
found = true;
+ }
}
-
+
if (UDDISubscriptionListenerImpl.notificationCount == 0) {
logger.warn("Test failed, dumping business list");
logger.warn("BEFORE " + before);
- logger.warn("After " + DumpAllBusinesses());
+ logger.warn("After " + TckCommon.DumpAllBusinesses(authInfoJoe, inquiryJoe));
Assert.fail("No Notification was sent");
}
if (!found) {
logger.warn("Test failed, dumping business list");
logger.warn("BEFORE " + before);
- logger.warn("After " + DumpAllBusinesses());
+ logger.warn("After " + TckCommon.DumpAllBusinesses(authInfoJoe, inquiryJoe));
Assert.fail("Notification does not contain the correct service");
}
@@ -447,89 +448,44 @@ public class UDDI_090_SubscriptionListen
}
}
- private static String DumpAllServices() {
- StringBuilder sb = new StringBuilder();
- FindService fs = new FindService();
- fs.setFindQualifiers(new FindQualifiers());
- fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
- fs.getName().add(new Name("%", null));
- try {
- ServiceList findService = inquiryJoe.findService(fs);
- if (findService.getServiceInfos() == null) {
- return ("NO SERVICES RETURNED!");
- } else {
- for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
- sb.append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getValue()).append(" lang=").append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getLang()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()).append(
- System.getProperty("line.separator"));
- }
- }
- } catch (Exception ex) {
- sb.append(ex.getMessage());
- }
- return sb.toString();
- }
-
- private static String DumpAllBusinesses() {
- StringBuilder sb = new StringBuilder();
- FindBusiness fs = new FindBusiness();
- fs.setFindQualifiers(new FindQualifiers());
- fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
- fs.getName().add(new Name("%", null));
- try {
- BusinessList findService = inquiryJoe.findBusiness(fs);
- if (findService.getBusinessInfos() == null) {
- return ("NO BUSINESSES RETURNED!");
- } else {
- for (int i = 0; i < findService.getBusinessInfos().getBusinessInfo().size(); i++) {
- sb.append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getValue()).
- append(" lang=").append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getLang()).
- append(" ").append(findService.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey());
- }
- }
- } catch (Exception ex) {
- return ex.getMessage();
- }
- return sb.toString();
- }
-
@Test
public void joePublisherUpdate_SMTP_FIND_BUSINESS() {
Assume.assumeNotNull(email);
logger.info("joePublisherUpdate_SMTP_FIND_BUSINESS");
try {
TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
- String before = DumpAllBusinesses();
+ String before = TckCommon.DumpAllBusinesses(authInfoJoe, inquiryJoe);
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
tckBusinessServiceJoe.saveJoePublisherService(authInfoJoe);
//Saving the Listener Service
tckSubscriptionListenerJoe.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_SMTP_SERVICE_EXTERNAL_XML, 0, email);
-
+
//Saving the Subscription
tckSubscriptionListenerJoe.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION2_SMTP_XML);
-
+
Thread.sleep(3000);
logger.info("Saving Mary's Business ********** ");
tckBusinessMary.saveBusiness(authInfoMary, MARY_BUSINESS_XML, "uddi:uddi.marypublisher.com:marybusinessone");
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
boolean received = false;
- for (int i = 0; i < 12; i++) {
- Thread.sleep(5000);
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
if (fetchMail("marybusinessone") > 0) {
logger.info("Received Email Notification");
received = true;
break;
}
}
- if (!received)
- {
+ if (!received) {
logger.warn("Test failed, dumping before and after business list");
- logger.warn("Before " + before );
- logger.warn("After " + DumpAllBusinesses());
+ logger.warn("Before " + before);
+ logger.warn("After " + TckCommon.DumpAllBusinesses(authInfoJoe, inquiryJoe));
Assert.fail("No email was received");
}
-
+
} catch (Exception e) {
logger.error("No exceptions please.");
@@ -554,6 +510,8 @@ public class UDDI_090_SubscriptionListen
try {
UDDISubscriptionListenerImpl.notifcationMap.clear();
UDDISubscriptionListenerImpl.notificationCount = 0;
+ String before = TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe);
+
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckTModelJoe.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -567,22 +525,35 @@ public class UDDI_090_SubscriptionListen
logger.info("Deleting tModel ********** ");
tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
//waiting up to 100 seconds for the listener to notice the change.
- String test = "";
- for (int i = 0; i < 200; i++) {
- Thread.sleep(500);
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
System.out.print(".");
if (UDDISubscriptionListenerImpl.notificationCount > 0) {
logger.info("Received Notification");
break;
- } else {
- System.out.print(test);
}
}
if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
Assert.fail("No Notification was sent");
}
- if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">tModel One</name>")) {
+ Iterator<String> it = UDDISubscriptionListenerImpl.notifcationMap.values().iterator();
+ boolean found = false;
+ while (it.hasNext()) {
+ String test = it.next();
+ if (test.contains("tModel One")) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
Assert.fail("Notification does not contain the correct service");
}
@@ -607,6 +578,7 @@ public class UDDI_090_SubscriptionListen
TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe);
try {
+ String before = TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe);
tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
tckTModelJoe.saveTModels(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3);
tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
@@ -620,9 +592,10 @@ public class UDDI_090_SubscriptionListen
logger.info("Deleting tModel ********** ");
tckTModelJoe.deleteTModel(authInfoJoe, TckTModel.JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3, TckTModel.JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY);
+ logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
boolean received = false;
- for (int i = 0; i < 12; i++) {
- Thread.sleep(5000);
+ for (int i = 0; i < TckPublisher.getSubscriptionTimeout(); i++) {
+ Thread.sleep(1000);
System.out.print(".");
if (fetchMail("tModel One") > 0) {
logger.info("Received Email Notification");
@@ -630,7 +603,13 @@ public class UDDI_090_SubscriptionListen
break;
}
}
- Assert.assertTrue("No email was received", received);
+ if (!received){
+ logger.warn("Test failed, dumping business list");
+ logger.warn("BEFORE " + before);
+ logger.warn("After " + TckCommon.DumpAllTModels(authInfoJoe, inquiryJoe));
+ Assert.fail("No email was received");
+ }
+
} catch (Exception e) {
logger.error("No exceptions please.");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org