JUDDI-948 updating test cases. should hopefully fix issues discovered running the build on ubuntu. looks like the cause had to do with the order in which tests were being ran. added/fixed guards to those cases and to use the correct permissions for the "uddi" account
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
index f27c89f..c4beb0c 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
@@ -64,7 +64,7 @@
Registry.start();
logger.debug("Getting auth token..");
try {
- tckTModel.saveUDDIPublisherTmodel(authInfoJoe);
+ tckTModel.saveUDDIPublisherTmodel(TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()));
api010.saveJoePublisher();
authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
} catch (RemoteException e) {
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
index 702dc0c..e295b47 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
@@ -17,6 +17,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
+import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -124,18 +125,23 @@
String ns = wsdlDefinition.getTargetNamespace();
System.out.println("Namespace: " + ns);
- int i = 0;
- for (QName qName : portTypes.keySet()) {
+ boolean foundInterfaceOfTravelAgent=false;
+ boolean foundInterfaceOfCustomer=false;
+
+ Iterator<QName> iterator = portTypes.keySet().iterator();
+ while (iterator.hasNext()) {
+ QName qName = iterator.next();
String nsp = qName.getNamespaceURI();
String localpart = qName.getLocalPart();
System.out.println("Namespace: " + nsp);
System.out.println("LocalPart: " + localpart);
- if (i++ == 0) {
- Assert.assertEquals("InterfaceOfTravelAgent", localpart);
- } else {
- Assert.assertEquals("InterfaceOfCustomer", localpart);
- }
+ if (localpart.equals("InterfaceOfTravelAgent"))
+ foundInterfaceOfTravelAgent=true;
+ if (localpart.equals("InterfaceOfCustomer"))
+ foundInterfaceOfCustomer=true;
}
+ org.junit.Assert.assertTrue("InterfaceOfCustomer wasn't found, wsdl parsing error", foundInterfaceOfCustomer);
+ org.junit.Assert.assertTrue("InterfaceOfTravelAgent wasn't found, wsdl parsing error", foundInterfaceOfTravelAgent);
}
@Test
