Merge pull request #58 from opengeospatial/issue#57

Annotated descriptions with Annex A and B numbers

pom.xml

@@ -174,7 +174,7 @@
         <artifactId>buildnumber-maven-plugin</artifactId>
       </plugin>
     </plugins>
-    
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -252,7 +252,7 @@
       </plugins>
     </pluginManagement>
   </build>
-  
+
   <profiles>
     <profile>
       <id>docker</id>

src/main/config/teamengine/config.xml

@@ -14,14 +14,8 @@
         <title>OGC SensorML 2.0 Validator</title>
         <description>Validates the structure and content of standard SnesorML 2.0 documents.</description>
         <BasicConformanceClasses>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.CoreConcept</conformanceClass>
-		  <!-- <conformanceClass>org.opengis.cite.sensorml20.level1.PhysicalComponent</conformanceClass>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.PhysicalSystem</conformanceClass>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.CoreAbstractProcess</conformanceClass>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.SimpleProcess</conformanceClass>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.AggregateProcess</conformanceClass>
-		  <conformanceClass>org.opengis.cite.sensorml20.level1.ConfigurableProcesses</conformanceClass> -->
-		</BasicConformanceClasses>
+		       <conformanceClass>Conformance Level 1</conformanceClass>
+		    </BasicConformanceClasses>
       </suite>
       <revision>
         <name>${version}</name>

src/main/java/org/opengis/cite/sensorml20/level1/AggregateProcess.java

@@ -9,54 +9,54 @@
 import org.w3c.dom.NodeList;
 
 public class AggregateProcess extends BaseFixture{
-	@Test(description = "Requirement 22" , groups  = "AggregateProcess" , dependsOnGroups  = { "SimpleProcess" })
+	@Test(description = "A.4.1 - Requirement 22" , groups  = "AggregateProcess" , dependsOnGroups  = { "SimpleProcess" })
 	public void DependencyCore()
 	{
 		String rootName = this.testSubject.getDocumentElement().getNodeName();
 
 		if(!rootName.equals("sml:AggregateProcess"))
 		{
-			throw new SkipException("Not a Aggregate Process");	
+			throw new SkipException("Not an Aggregate Process");
 		}
 	}
-	
-	@Test(description = "Requirement 23" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" , "Definition" , "Components" })
+
+	@Test(description = "A.4.2 - Requirement 23" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" , "Definition" , "Components" })
 	public void PackageFullyImplemented()
 	{
 		//Dependency All AggregateProcess Tests
 	}
-	
-	@Test(description = "Requirement 24" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" })
+
+	@Test(description = "A.4.3 - Requirement 24" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" })
 	public void Definition()
 	{
 		String rootName = this.testSubject.getDocumentElement().getNodeName();
-		
+
 		if(rootName == "sml:AggregateProcess")
-		{			
+		{
 			if(this.testSubject.getElementsByTagName("sml:inputs").getLength() == 0)
 			{
 				throw new AssertionError("AggregateProcess Must Define Inputs !!");
 			}
-			
+
 			if(this.testSubject.getElementsByTagName("sml:outputs").getLength() == 0)
 			{
 				throw new AssertionError("AggregateProcess Must Define Outputs !!");
 			}
-			
+
 			if(this.testSubject.getElementsByTagName("sml:components").getLength() == 0)
 			{
 				throw new AssertionError("AggregateProcess Must Define Sub Process !!");
 			}
 		}
-	}	
-	
-	@Test(description = "Requirement 25" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" })
+	}
+
+	@Test(description = "A.4.4 - Requirement 25" , groups  = "AggregateProcess" , dependsOnMethods  = { "DependencyCore" })
 	public void Components()
 	{
 		String rootName = this.testSubject.getDocumentElement().getNodeName();
-		
+
 		if(rootName == "sml:AggregateProcess")
-		{			
+		{
 			NodeList components = this.testSubject.getDocumentElement().getElementsByTagName("sml:components");
 			if(components.getLength() > 0)
 			{
@@ -73,7 +73,7 @@ public void Components()
 				}
 
 				if(componentsList.size() > 1)
-				{	
+				{
 					NodeList component = componentsList.get(0).getChildNodes();
 					if(component.getLength() == 0)
 					{
@@ -82,7 +82,7 @@ public void Components()
 					else
 					{
 						Boolean checkComponent = false;
-						
+
 						for(int i=0 ; i<component.getLength() ; i++)
 						{
 							Element item = (Element)component.item(i);
@@ -97,18 +97,18 @@ public void Components()
 				else
 				{
 					throw new AssertionError("componentsList does not exist !!");
-				}			
-				
+				}
+
 			}
 			else
 			{
 				throw new AssertionError("components does not exist !!");
 			}
-			
+
 			if(this.testSubject.getDocumentElement().getElementsByTagName("sml:connections").getLength() == 0)
 			{
 				throw new AssertionError("connection does not exist !!");
 			}
-		}	
+		}
 	}
 }