Modified: incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java?view=diff&rev=546553&r1=546552&r2=546553 ============================================================================== --- incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java (original) +++ incubator/woden/trunk/java/test/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java Tue Jun 12 09:19:17 2007 @@ -93,11 +93,11 @@ } /** - * Test that the testAssertionDescription0025 method returns + * Test that the testAssertionDescription1006 method returns * true if given a description element with an absolute IRI, * false otherwise. */ - public void testTestAssertionDescription0025() + public void testTestAssertionDescription1006() { // Test that no error is reported with an absolute IRI. handler.reset(); @@ -106,7 +106,7 @@ DescriptionElement desc = new DOMWSDLFactory().newDescription(); desc.setTargetNamespace(new URI("http://www.sample.org";)); - if(!val.testAssertionDescription0025(desc, reporter)) + if(!val.testAssertionDescription1006(desc, reporter)) { fail("A message was reported for a description element with an absolute IRI."); } @@ -116,13 +116,13 @@ fail("There was a problem while testing an absolute IRI."); } - // Test that error Description-0025 is reported for a relative IRI. + // Test that error Description-1006 is reported for a relative IRI. handler.reset(); try { DescriptionElement desc = new DOMWSDLFactory().newDescription(); desc.setTargetNamespace(new URI("//www.sample.org")); - boolean isValid = val.testAssertionDescription0025(desc, reporter); + boolean isValid = val.testAssertionDescription1006(desc, reporter); if(isValid) { fail("No message was reported for a description element with the relative IRI //www.sample.org."); @@ -139,9 +139,9 @@ { fail("More than one error was reported for a description element with the relative IRI //www.sample.org."); } - else if(!handler.errors.containsKey("Description-0025")) + else if(!handler.errors.containsKey("Description-1006")) { - fail("The error for Description-0025 was not reported for a description element with the relative IRI //www.sample.org."); + fail("The error for Description-1006 was not reported for a description element with the relative IRI //www.sample.org."); } } catch(Exception e) @@ -152,10 +152,10 @@ } /** - * Test assertion Schema-0052. An imported schema must contain the + * Test assertion Schema-1070. An imported schema must contain the * same target namespace as the import element. */ - public void testTestAssertionSchema0052() + public void testTestAssertionSchema1070() { // Test that no error is reported for an imported schema that has // a null schema. This error should be caught elseware. @@ -165,9 +165,9 @@ ImportedSchemaImpl importedSchema = new ImportedSchemaImpl(); importedSchema.setNamespace(new URI("http://www.sample.org";)); - if(!val.testAssertionSchema0052(importedSchema, reporter)) + if(!val.testAssertionSchema1070(importedSchema, reporter)) { - fail("The testAssertionSchema0052 method returned false for a null schema."); + fail("The testAssertionSchema1070 method returned false for a null schema."); } } catch(URISyntaxException e) @@ -191,9 +191,9 @@ XmlSchema schema = new XmlSchema("http://www.sample.org";, null); importedSchema.setSchemaDefinition(schema); - if(!val.testAssertionSchema0052(importedSchema, reporter)) + if(!val.testAssertionSchema1070(importedSchema, reporter)) { - fail("The testAssertionSchema0052 method returned false for a schema with the same target namespace as the import element."); + fail("The testAssertionSchema1070 method returned false for a schema with the same target namespace as the import element."); } } catch(URISyntaxException e) @@ -217,7 +217,7 @@ XmlSchema schema = new XmlSchema("http://differentnamespace.sample.org";, null); importedSchema.setSchemaDefinition(schema); - if(val.testAssertionSchema0052(importedSchema, reporter)) + if(val.testAssertionSchema1070(importedSchema, reporter)) { fail("There was no error reported for a schema with a different target namespace than the import element."); } @@ -225,9 +225,9 @@ { fail("More than one error was reported for a schema with a different target namespace than the import element."); } - else if(!handler.errors.containsKey("Schema-0052")) + else if(!handler.errors.containsKey("Schema-1070")) { - fail("The error Schema-0052 was not reported for a schema with a different target namespace than the import element."); + fail("The error Schema-1070 was not reported for a schema with a different target namespace than the import element."); } } catch(URISyntaxException e) @@ -251,7 +251,7 @@ XmlSchema schema = new XmlSchema(null, null); importedSchema.setSchemaDefinition(schema); - if(val.testAssertionSchema0052(importedSchema, reporter)) + if(val.testAssertionSchema1070(importedSchema, reporter)) { fail("There was no error reported for a schema with a null target namespace."); } @@ -259,9 +259,9 @@ { fail("More than one error was reported for a schema with a null target namespace."); } - else if(!handler.errors.containsKey("Schema-0052")) + else if(!handler.errors.containsKey("Schema-1070")) { - fail("The error Schema-0052 was not reported for a schema with a null target namespace."); + fail("The error Schema-1070 was not reported for a schema with a null target namespace."); } } catch(URISyntaxException e) @@ -285,7 +285,7 @@ XmlSchema schema = new XmlSchema("", null); importedSchema.setSchemaDefinition(schema); - if(val.testAssertionSchema0052(importedSchema, reporter)) + if(val.testAssertionSchema1070(importedSchema, reporter)) { fail("There was no error reported for a schema with an empty target namespace."); } @@ -293,9 +293,9 @@ { fail("More than one error was reported for a schema with an empty target namespace."); } - else if(!handler.errors.containsKey("Schema-0052")) + else if(!handler.errors.containsKey("Schema-1070")) { - fail("The error Schema-0052 was not reported for a schema with an empty target namespace."); + fail("The error Schema-1070 was not reported for a schema with an empty target namespace."); } } catch(URISyntaxException e) @@ -309,10 +309,10 @@ } /** - * Test assertion Schema-0017. An imported schema must contain a + * Test assertion Schema-1069. An imported schema must contain a * target namespace. */ - public void testTestAssertionSchema0017() + public void testTestAssertionSchema1069() { // Test that no error is reported for an imported schema that has // a null schema. This error should be caught elseware. @@ -322,7 +322,7 @@ ImportedSchemaImpl importedSchema = new ImportedSchemaImpl(); importedSchema.setNamespace(new URI("http://www.sample.org";)); - if(!val.testAssertionSchema0017(importedSchema, reporter)) + if(!val.testAssertionSchema1069(importedSchema, reporter)) { fail("The testAssertionSchema0017 method returned false for a null schema."); } @@ -346,9 +346,9 @@ XmlSchema schema = new XmlSchema("http://www.sample.org";, null); importedSchema.setSchemaDefinition(schema); - if(!val.testAssertionSchema0017(importedSchema, reporter)) + if(!val.testAssertionSchema1069(importedSchema, reporter)) { - fail("The testAssertionSchema0017 method returned false for a schema with a target namespace."); + fail("The testAssertionSchema1069 method returned false for a schema with a target namespace."); } } catch(URISyntaxException e) @@ -372,7 +372,7 @@ XmlSchema schema = new XmlSchema(null, null); importedSchema.setSchemaDefinition(schema); - if(val.testAssertionSchema0017(importedSchema, reporter)) + if(val.testAssertionSchema1069(importedSchema, reporter)) { fail("There was no error reported for a schema with a null target namespace."); } @@ -380,9 +380,9 @@ { fail("More than one error was reported for a schema with a null target namespace."); } - else if(!handler.errors.containsKey("Schema-0017")) + else if(!handler.errors.containsKey("Schema-1069")) { - fail("The error Schema-0017 was not reported for a schema with a null target namespace."); + fail("The error Schema-1069 was not reported for a schema with a null target namespace."); } } catch(URISyntaxException e) @@ -406,7 +406,7 @@ XmlSchema schema = new XmlSchema("", null); importedSchema.setSchemaDefinition(schema); - if(val.testAssertionSchema0017(importedSchema, reporter)) + if(val.testAssertionSchema1069(importedSchema, reporter)) { fail("There was no error reported for a schema with an empty target namespace."); } @@ -414,9 +414,9 @@ { fail("More than one error was reported for a schema with an empty target namespace."); } - else if(!handler.errors.containsKey("Schema-0017")) + else if(!handler.errors.containsKey("Schema-1069")) { - fail("The error Schema-0017 was not reported for a schema with an empty target namespace."); + fail("The error Schema-1069 was not reported for a schema with an empty target namespace."); } } catch(URISyntaxException e) @@ -431,10 +431,10 @@ } /** - * Test assertion Schema-0018. Inline schemas must not define an element with a name + * Test assertion Schema-1073. Inline schemas must not define an element with a name * of an element that has already been defined in another inline schema with the same target namespace. */ - public void testTestAssertionSchema0018() + public void testTestAssertionSchema1073() { String schemaString = "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\"; targetNamespace=\"http://www.sample.org\";>" + "<element name=\"myElement\" type=\"string\"/></schema>"; @@ -445,9 +445,9 @@ try { InlinedSchema[] emptySchemaList = new InlinedSchema[0]; - if(!val.testAssertionSchema0018(emptySchemaList, reporter)) + if(!val.testAssertionSchema1073(emptySchemaList, reporter)) { - fail("The testAssertionSchema0018 method returned false for an empty inline schema list."); + fail("The testAssertionSchema1073 method returned false for an empty inline schema list."); } } catch(WSDLException e) @@ -482,7 +482,7 @@ XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); inlinedSchemas[1].setSchemaDefinition(xs2); - if(val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was no error reported for an inline schema that declares the same element as another inline schema with the same namespace."); } @@ -528,7 +528,7 @@ XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); inlinedSchemas[1].setSchemaDefinition(xs2); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema that declares the same element as another inline schema but has a different target namespace."); } @@ -564,7 +564,7 @@ XmlSchemaCollection xsc = new XmlSchemaCollection(); XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema list that contains only one inline schema."); } @@ -591,7 +591,7 @@ inlinedSchemas[0].setNamespace(new URI("http://www.sample.org";)); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema list that contains a schema that couldn't be read (is null)."); } @@ -623,7 +623,7 @@ XmlSchemaCollection xsc = new XmlSchemaCollection(); XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema list that contains only one inline schema."); } @@ -648,7 +648,7 @@ InlinedSchema[] inlinedSchemas = new InlinedSchema[1]; inlinedSchemas[0]= new InlinedSchemaImpl(); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema that contains a null namespace."); } @@ -661,10 +661,10 @@ } /** - * Test assertion Schema-0018b. Inline schemas must not define a type with a name + * Test assertion Schema-1073b. Inline schemas must not define a type with a name * of an type that has already been defined in another inline schema with the same target namespace. */ - public void testTestAssertionSchema0018b() + public void testTestAssertionSchema1073b() { String schemaString = "<schema xmlns=\"http://www.w3.org/2001/XMLSchema\"; targetNamespace=\"http://www.sample.org\";>" + "<complexType name=\"myType\">" @@ -685,9 +685,9 @@ try { InlinedSchema[] emptySchemaList = new InlinedSchema[0]; - if(!val.testAssertionSchema0018(emptySchemaList, reporter)) + if(!val.testAssertionSchema1073(emptySchemaList, reporter)) { - fail("The testAssertionSchema0018b method returned false for an empty inline schema list."); + fail("The testAssertionSchema1073b method returned false for an empty inline schema list."); } } catch(WSDLException e) @@ -723,7 +723,7 @@ XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); inlinedSchemas[1].setSchemaDefinition(xs2); - if(val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was no error reported for an inline schema that declares the same type as another inline schema with the same namespace."); } @@ -769,7 +769,7 @@ XmlSchema xs2 = xsc.read(schemaDoc2.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); inlinedSchemas[1].setSchemaDefinition(xs2); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema that declares the same element as another inline schema but has a different target namespace."); } @@ -805,7 +805,7 @@ XmlSchemaCollection xsc = new XmlSchemaCollection(); XmlSchema xs1 = xsc.read(schemaDoc1.getDocumentElement()); inlinedSchemas[0].setSchemaDefinition(xs1); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema list that contains only one inline schema."); } @@ -832,7 +832,7 @@ inlinedSchemas[0].setNamespace(new URI("http://www.sample.org";)); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema list that contains a schema that couldn't be read (is null)."); } @@ -853,7 +853,7 @@ InlinedSchema[] inlinedSchemas = new InlinedSchema[1]; inlinedSchemas[0]= new InlinedSchemaImpl(); - if(!val.testAssertionSchema0018(inlinedSchemas, reporter)) + if(!val.testAssertionSchema1073(inlinedSchemas, reporter)) { fail("There was an error reported for an inline schema that contains a null namespace."); } @@ -865,10 +865,10 @@ } /** - * Test assertion Interface-0031. Style defaults specified on interface elements + * Test assertion Interface-1012. Style defaults specified on interface elements * must all be absolute. */ - public void testTestAssertionInterface0031() + public void testTestAssertionInterface1012() { URI relativeURI = null; URI relativeURI2 = null; @@ -890,9 +890,9 @@ { DescriptionImpl desc = new DescriptionImpl(); InterfaceElement interfaceElem = desc.addInterfaceElement(); - if(!val.testAssertionInterface0031(interfaceElem, reporter)) + if(!val.testAssertionInterface1012(interfaceElem, reporter)) { - fail("The testAssertionInterface0031 method returned false for an interface that specifies no style defaults."); + fail("The testAssertionInterface1012 method returned false for an interface that specifies no style defaults."); } } catch(WSDLException e) @@ -907,9 +907,9 @@ DescriptionImpl desc = new DescriptionImpl(); InterfaceElement interfaceElem = desc.addInterfaceElement(); interfaceElem.addStyleDefaultURI(absoluteURI); - if(!val.testAssertionInterface0031(interfaceElem, reporter)) + if(!val.testAssertionInterface1012(interfaceElem, reporter)) { - fail("The testAssertionInterface0031 method returned false for an interface that specifies one absolute style default."); + fail("The testAssertionInterface1012 method returned false for an interface that specifies one absolute style default."); } } catch(WSDLException e) @@ -924,9 +924,9 @@ DescriptionImpl desc = new DescriptionImpl(); InterfaceElement interfaceElem = desc.addInterfaceElement(); interfaceElem.addStyleDefaultURI(relativeURI); - if(val.testAssertionInterface0031(interfaceElem, reporter)) + if(val.testAssertionInterface1012(interfaceElem, reporter)) { - fail("The testAssertionInterface0031 method returned true for an interface that specifies one relative style default."); + fail("The testAssertionInterface1012 method returned true for an interface that specifies one relative style default."); } } catch(WSDLException e) @@ -942,9 +942,9 @@ InterfaceElement interfaceElem = desc.addInterfaceElement(); interfaceElem.addStyleDefaultURI(absoluteURI); interfaceElem.addStyleDefaultURI(relativeURI); - if(val.testAssertionInterface0031(interfaceElem, reporter)) + if(val.testAssertionInterface1012(interfaceElem, reporter)) { - fail("The testAssertionInterface0031 method returned true for an interface that specifies an absolute style default and a relative style default."); + fail("The testAssertionInterface1012 method returned true for an interface that specifies an absolute style default and a relative style default."); } } catch(WSDLException e) @@ -960,10 +960,10 @@ InterfaceElement interfaceElem = desc.addInterfaceElement(); interfaceElem.addStyleDefaultURI(relativeURI); interfaceElem.addStyleDefaultURI(relativeURI2); - val.testAssertionInterface0031(interfaceElem, reporter); + val.testAssertionInterface1012(interfaceElem, reporter); if(handler.numErrors != 2) { - fail("The testAssertionInterface0031 method only reported one error for an interface that specifies two relative style defaults."); + fail("The testAssertionInterface1012 method only reported one error for an interface that specifies two relative style defaults."); } } catch(WSDLException e) @@ -1259,14 +1259,14 @@ * TODO: this assertion has been removed from the WSDL2 spec during CR, so * ignore this test method when reimplementing the validation code. * - * Test assertion Schema-0016. References to XML schema components must only refer + * Test assertion Schema-1066. References to XML schema components must only refer * to elements and types in namespaces that have been imported or inlined or that * are part of the XML schema namespace. * * TODO: Implement tests for specific elements that contain invalid references. * These tests should probably be contained in a test method for validateInterfaces, validateBindings, etc. */ - public void dontTestAssertionSchema0016() + public void testTestAssertionSchema1066() { // Create a schema for use in the tests and add it to a types section. InlinedSchema schema = new InlinedSchemaImpl(); @@ -1308,9 +1308,9 @@ TypesElement types = descElem.getTypesElement(); types.addSchema(schema); - if(!val.testAssertionSchema0016(descElem, null, reporter)) + if(!val.testAssertionSchema1066(descElem, null, reporter)) { - fail("The testAssertionSchema0016 method returned false for a null namespace."); + fail("The testAssertionSchema1066 method returned false for a null namespace."); } } catch(WSDLException e) @@ -1327,9 +1327,9 @@ TypesElement types = descElem.getTypesElement(); types.addSchema(schema); - if(!val.testAssertionSchema0016(descElem, "http://www.sample.org";, reporter)) + if(!val.testAssertionSchema1066(descElem, "http://www.sample.org";, reporter)) { - fail("The testAssertionSchema0016 method returned false for a namespace that has been defined inline."); + fail("The testAssertionSchema1066 method returned false for a namespace that has been defined inline."); } } catch(WSDLException e) @@ -1349,9 +1349,9 @@ importedSchema.setNamespace(schemaNS); typesImported.addSchema(importedSchema); - if(!val.testAssertionSchema0016(descElem, "http://www.sample.org";, reporter)) + if(!val.testAssertionSchema1066(descElem, "http://www.sample.org";, reporter)) { - fail("The testAssertionSchema0016 method returned false for a namespace that has been imported."); + fail("The testAssertionSchema1066 method returned false for a namespace that has been imported."); } } catch(WSDLException e) @@ -1366,9 +1366,9 @@ DescriptionElement descElem = new DescriptionImpl(); //descElem.setTypesElement(types); - if(!val.testAssertionSchema0016(descElem, Constants.TYPE_XSD_2001, reporter)) + if(!val.testAssertionSchema1066(descElem, Constants.TYPE_XSD_2001, reporter)) { - fail("The testAssertionSchema0016 method returned false for the XML Schema namespace."); + fail("The testAssertionSchema1066 method returned false for the XML Schema namespace."); } } catch(WSDLException e) @@ -1384,9 +1384,9 @@ DescriptionElement descElem = new DescriptionImpl(); //descElem.setTypesElement(types); - if(val.testAssertionSchema0016(descElem, "http://www.sample2.org";, reporter)) + if(val.testAssertionSchema1066(descElem, "http://www.sample2.org";, reporter)) { - fail("The testAssertionSchema0016 method returned true for a namespace that is not available.."); + fail("The testAssertionSchema1066 method returned true for a namespace that is not available.."); } } catch(WSDLException e) @@ -1408,9 +1408,9 @@ inlinedSchema2.setNamespace(schemaNS); typesImported.addSchema(inlinedSchema2); - if(!val.testAssertionSchema0016(descElem, "http://www.sample.org";, reporter)) + if(!val.testAssertionSchema1066(descElem, "http://www.sample.org";, reporter)) { - fail("The testAssertionSchema0016 method returned false for a namespace that has been imported."); + fail("The testAssertionSchema1066 method returned false for a namespace that has been imported."); } } catch(WSDLException e)
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
