Author: slaws
Date: Mon Nov 14 14:08:48 2011
New Revision: 1201712
URL: http://svn.apache.org/viewvc?rev=1201712&view=rev
Log:
Deal with a couple of cases where the order of results differs depending on
whether I'm on the IBM or Oracle JDK.
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/security/jsr250/PolicyProcessorTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java?rev=1201712&r1=1201711&r2=1201712&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
Mon Nov 14 14:08:48 2011
@@ -386,7 +386,7 @@ public class JMSBindingProcessorWriteTes
}
// TUSCANY-3120
- // Checking we don't write out values unless the use has specified them on
input
+ // Checking we don't write out values unless the user has specified them
on input
public void testDefault() throws Exception {
XMLStreamReader reader =
inputFactory.createXMLStreamReader(new StringReader(DEFAULT));
@@ -397,7 +397,10 @@ public class JMSBindingProcessorWriteTes
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(composite,
outputFactory.createXMLStreamWriter(bos), context);
- System.out.println(bos.toString());
+ String outputString = bos.toString();
+ System.out.println(outputString);
+ /* replace with slightly different test so any ordering differences in
written
+ * XML don't fail the test
assertEquals(bos.toString(),
"<?xml version=\'1.0\' encoding=\'UTF-8\'?>" +
"<composite
xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\";
targetNamespace=\"http://binding-jms\"; name=\"binding-jms\">" +
@@ -413,6 +416,24 @@ public class JMSBindingProcessorWriteTes
"</service>" +
"</component>" +
"</composite>");
+ */
+ assertEquals(true, outputString.contains("binding.jms"));
+ assertEquals(true, outputString.contains("operationProperties"));
+ assertEquals(true, outputString.contains("destination"));
+ assertEquals(true, outputString.contains("jndiName"));
+ assertEquals(true, outputString.contains("type"));
+ assertEquals(true, outputString.contains("property"));
+ assertEquals(true, outputString.contains("connectionFactory"));
+ assertEquals(true, outputString.contains("resourceAdapter"));
+
+ assertEquals(false, outputString.contains("headers"));
+ assertEquals(false, outputString.contains("response"));
+ assertEquals(false, outputString.contains("activationSpec"));
+ assertEquals(false, outputString.contains("messageSelection"));
+ assertEquals(false, outputString.contains("initialContextFactory"));
+ assertEquals(false, outputString.contains("correlationScheme"));
+ assertEquals(false, outputString.contains("wireFormat"));
+ assertEquals(false, outputString.contains("operationSelector"));
}
public void testOperationPropertiesName() throws Exception {
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/security/jsr250/PolicyProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/security/jsr250/PolicyProcessorTestCase.java?rev=1201712&r1=1201711&r2=1201712&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/security/jsr250/PolicyProcessorTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/security/jsr250/PolicyProcessorTestCase.java
Mon Nov 14 14:08:48 2011
@@ -177,26 +177,30 @@ public class PolicyProcessorTestCase ext
}
public void testSingleInterfaceWithRolesAllowedAtMethodLevel() throws
Exception {
- runProcessors(Service4.class, Service4.class.getMethods()[1], type);
- Operation op = getOperationModel(Service4.class.getMethods()[1], type);
+ Method aMethod = Service4.class.getDeclaredMethod("method2");
+ runProcessors(Service4.class, aMethod, type);
+ Operation op = getOperationModel(aMethod, type);
Assert.assertEquals(1, op.getPolicySets().size());
}
public void testSingleInterfaceWithPermitAllAtMethodLevel() throws
Exception {
- runProcessors(Service4.class, Service4.class.getMethods()[2], type);
- Operation op = getOperationModel(Service4.class.getMethods()[2], type);
+ Method aMethod = Service4.class.getDeclaredMethod("method3");
+ runProcessors(Service4.class, aMethod, type);
+ Operation op = getOperationModel(aMethod, type);
Assert.assertEquals(1, op.getPolicySets().size());
}
public void testSingleInterfaceWithDenyAllAtMethodLevel() throws Exception
{
- runProcessors(Service4.class, Service4.class.getMethods()[3], type);
- Operation op = getOperationModel(Service4.class.getMethods()[3], type);
+ Method aMethod = Service4.class.getDeclaredMethod("method4");
+ runProcessors(Service4.class, aMethod, type);
+ Operation op = getOperationModel(aMethod, type);
Assert.assertEquals(1, op.getPolicySets().size());
}
public void testSingleInterfaceWithNothingAtMethodLevel() throws Exception
{
- runProcessors(Service4.class, Service4.class.getMethods()[0], type);
- Operation op = getOperationModel(Service4.class.getMethods()[0], type);
+ Method aMethod = Service4.class.getDeclaredMethod("method1");
+ runProcessors(Service4.class, aMethod, type);
+ Operation op = getOperationModel(aMethod, type);
Assert.assertEquals(0, op.getPolicySets().size());
}
@@ -210,13 +214,11 @@ public class PolicyProcessorTestCase ext
}
private Operation getOperationModel(Method method, JavaImplementation
type){
-
for(Operation op : type.getOperations()){
if (((JavaOperation)op).getJavaMethod().equals(method)){
return op;
}
}
-
return null;
}
}
