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/05/23 04:13:43 UTC
svn commit: r1485539 - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/validation/
juddi-core/src/main/resources/
uddi-tck/src/test/java/org/apache/juddi/v3/tck/
Author: alexoree
Date: Thu May 23 02:13:42 2013
New Revision: 1485539
URL: http://svn.apache.org/r1485539
Log:
Fixing the build, resolve a bug with custody transfer and an index mismatch error
adding additional test cases for the subscription api, non-callback interactions
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java
juddi/trunk/juddi-core/src/main/resources/messages.properties
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java?rev=1485539&r1=1485538&r2=1485539&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateCustodyTransfer.java Thu May 23 02:13:42 2013
@@ -180,6 +180,8 @@ public class ValidateCustodyTransfer ext
Collections.sort(apiKeyList);
Collections.sort(modelKeyList);
int count = 0;
+ if (modelKeyList.size()!=apiKeyList.size())
+ throw new TransferNotAllowedException(new ErrorMessage("errors.transferentities.KeySizeMismatch"));
for (String key : apiKeyList) {
// Per section 4.4: keys must be case-folded
key = key.toLowerCase();
Modified: juddi/trunk/juddi-core/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/messages.properties?rev=1485539&r1=1485538&r2=1485539&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/messages.properties (original)
+++ juddi/trunk/juddi-core/src/main/resources/messages.properties Thu May 23 02:13:42 2013
@@ -186,6 +186,7 @@ errors.transfertoken.NullInput=A transfe
errors.transferentities.TokenNotFound=The supplied transfer token was not found
errors.transferentities.TokenExpired=The supplied transfer token has expired
errors.transferentities.KeyMismatch=A supplied key does not match a key associated with the transfer request
+errors.transferentities.KeySizeMismatch=The quantity of transfered keys must equal the number of keys in the request
errors.savesubscription.NoInput=At least one Subscription must be provided
errors.subscription.NullInput=The subscription structure cannot be blank
errors.subscription.BindingDoesntExist=The requested subscription has a binding key defined, however that binding template does not exist
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1485539&r1=1485538&r2=1485539&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Thu May 23 02:13:42 2013
@@ -33,12 +33,17 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.FindBusiness;
import org.uddi.api_v3.FindQualifiers;
import org.uddi.api_v3.FindService;
import org.uddi.api_v3.Name;
import org.uddi.api_v3.SaveBusiness;
+import org.uddi.sub_v3.CoveragePeriod;
+import org.uddi.sub_v3.GetSubscriptionResults;
import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionFilter;
+import org.uddi.sub_v3.SubscriptionResultsList;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
@@ -426,7 +431,7 @@ public class UDDI_080_SubscriptionIntegr
DatatypeFactory df = DatatypeFactory.newInstance();
try {
-
+
Holder<List<Subscription>> data = new Holder<List<Subscription>>();
data.value = new ArrayList<Subscription>();
Subscription sub = new Subscription();
@@ -443,10 +448,156 @@ public class UDDI_080_SubscriptionIntegr
data.value.add(sub);
tckSubscription.subscription.saveSubscription(authInfoJoe, data);
+ Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ //HandleException(ex);
+ }
+ }
+
+ @Test
+ public void JUDDI_606_11() throws DatatypeConfigurationException {
+ //set subscription, make a change as the same user, get subscription results
+ //no key specified
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ try {
+
+ Holder<List<Subscription>> data = new Holder<List<Subscription>>();
+ data.value = new ArrayList<Subscription>();
+ Subscription sub = new Subscription();
+ sub.setBrief(false);
+ sub.setExpiresAfter(null);
+ sub.setMaxEntities(null);
+ sub.setNotificationInterval(null);
+ sub.setBindingKey(null);
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ sub.getSubscriptionFilter().setFindBusiness(new FindBusiness());
+ sub.getSubscriptionFilter().getFindBusiness().setFindQualifiers(new FindQualifiers());
+ sub.getSubscriptionFilter().getFindBusiness().getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ sub.getSubscriptionFilter().getFindBusiness().getName().add(new Name("%", null));
+ data.value.add(sub);
+
+ tckSubscription.subscription.saveSubscription(authInfoJoe, data);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name("Test business", null));
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+
+ GetSubscriptionResults gsr = new GetSubscriptionResults();
+ gsr.setAuthInfo(authInfoJoe);
+ gsr.setSubscriptionKey(null);
+ gsr.setCoveragePeriod(new CoveragePeriod());
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.HOUR, -1);
+ gsr.getCoveragePeriod().setStartPoint(df.newXMLGregorianCalendar(gcal));
+ gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gsr.getCoveragePeriod().setEndPoint(df.newXMLGregorianCalendar(gcal));
+ tckSubscription.subscription.getSubscriptionResults(gsr);
Assert.fail();
+ } catch (Exception ex) {
+ //HandleException(ex);
+ //Assert.fail();
}
}
+ @Test
+ public void JUDDI_606_12() throws DatatypeConfigurationException {
+ //set subscription, make a change as the same user, get subscription results
+ //no period specified
+
+ try {
+
+ Holder<List<Subscription>> data = new Holder<List<Subscription>>();
+ data.value = new ArrayList<Subscription>();
+ Subscription sub = new Subscription();
+ sub.setBrief(false);
+ sub.setExpiresAfter(null);
+ sub.setMaxEntities(null);
+ sub.setNotificationInterval(null);
+ sub.setBindingKey(null);
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ sub.getSubscriptionFilter().setFindBusiness(new FindBusiness());
+ sub.getSubscriptionFilter().getFindBusiness().setFindQualifiers(new FindQualifiers());
+ sub.getSubscriptionFilter().getFindBusiness().getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ sub.getSubscriptionFilter().getFindBusiness().getName().add(new Name("%", null));
+ data.value.add(sub);
+
+ tckSubscription.subscription.saveSubscription(authInfoJoe, data);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name("Test business", null));
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+
+ GetSubscriptionResults gsr = new GetSubscriptionResults();
+ gsr.setAuthInfo(authInfoJoe);
+ gsr.setSubscriptionKey(data.value.get(0).getSubscriptionKey());
+ gsr.setCoveragePeriod(null);
+ tckSubscription.subscription.getSubscriptionResults(gsr);
+ Assert.fail();
+ } catch (Exception ex) {
+ //HandleException(ex);
+ //Assert.fail();
+ }
+ }
+
+ @Test
+ public void JUDDI_606_13() throws DatatypeConfigurationException {
+ //set subscription, make a change as the same user, get subscription results
+ //valid find_Business
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ try {
+
+ Holder<List<Subscription>> data = new Holder<List<Subscription>>();
+ data.value = new ArrayList<Subscription>();
+ Subscription sub = new Subscription();
+ sub.setBrief(false);
+ sub.setExpiresAfter(null);
+ sub.setMaxEntities(null);
+ sub.setNotificationInterval(null);
+ sub.setBindingKey(null);
+ sub.setSubscriptionFilter(new SubscriptionFilter());
+ sub.getSubscriptionFilter().setFindBusiness(new FindBusiness());
+ sub.getSubscriptionFilter().getFindBusiness().setFindQualifiers(new FindQualifiers());
+ sub.getSubscriptionFilter().getFindBusiness().getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ sub.getSubscriptionFilter().getFindBusiness().getName().add(new Name("%", null));
+ data.value.add(sub);
+
+ tckSubscription.subscription.saveSubscription(authInfoJoe, data);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name("Test business", null));
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+
+ GetSubscriptionResults gsr = new GetSubscriptionResults();
+ gsr.setAuthInfo(authInfoJoe);
+ gsr.setSubscriptionKey(data.value.get(0).getSubscriptionKey());
+ gsr.setCoveragePeriod(new CoveragePeriod());
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.HOUR, -1);
+ gsr.getCoveragePeriod().setStartPoint(df.newXMLGregorianCalendar(gcal));
+ gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gsr.getCoveragePeriod().setEndPoint(df.newXMLGregorianCalendar(gcal));
+ SubscriptionResultsList subscriptionResults = tckSubscription.subscription.getSubscriptionResults(gsr);
+ Assert.assertNotNull(subscriptionResults);
+ Assert.assertNotNull(subscriptionResults.getBusinessList());
+ Assert.assertNotNull(subscriptionResults.getCoveragePeriod());
+ Assert.assertNotNull(subscriptionResults.getBusinessList().getBusinessInfos());
+ Assert.assertNotNull(subscriptionResults.getBusinessList().getBusinessInfos().getBusinessInfo().get(0));
+ Assert.assertNotNull(subscriptionResults.getBusinessList().getBusinessInfos().getBusinessInfo().get(0).getBusinessKey());
+ Assert.assertNotNull(subscriptionResults.getBusinessList().getBusinessInfos().getBusinessInfo().get(0).getName().get(0));
+
+ } catch (Exception ex) {
+ HandleException(ex);
+ Assert.fail();
+ }
+ }
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java?rev=1485539&r1=1485538&r2=1485539&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java Thu May 23 02:13:42 2013
@@ -248,7 +248,7 @@ public class UDDI_150_CustodyTransferInt
custodyTransferPortType.getTransferToken(authInfoJoe, kb, nodeidOUT, expiresOUT, tokenOUT);
Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ // HandleException(ex);
}
}
@@ -267,7 +267,7 @@ public class UDDI_150_CustodyTransferInt
Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ // HandleException(ex);
}
}
@@ -306,7 +306,7 @@ public class UDDI_150_CustodyTransferInt
Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ // HandleException(ex);
}
}
@@ -376,7 +376,7 @@ public class UDDI_150_CustodyTransferInt
custodyTransferPortType.transferEntities(te);
Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ // HandleException(ex);
}
}
@@ -394,11 +394,12 @@ public class UDDI_150_CustodyTransferInt
custodyTransferPortType.getTransferToken(authInfoJoe, kb, nodeidOUT, expiresOUT, tokenOUT);
Assert.fail();
} catch (Exception ex) {
- HandleException(ex);
+ //HandleException(ex);
}
}
@Test
public void ExpiredTransferToken() {
+ //TODO
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org