Changeset 2170

Timestamp:

08/29/12 10:04:26 (12 years ago)

Author:

olhsha

Message:

#50 Test in a file: null pointer exception fixed, the path to the file was misspelled
the method reading of a profile (a string) from a generic xml file is added to the RegistryTestHelper?

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test

Files:

• java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java (modified) (16 diffs)
• java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java (modified) (1 diff)
• resources/xml/Olhatest.xml (deleted)
• resources/xml/largeProfileDummyFilenames.xml (added)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java

@@ -28 +28 @@
 public class CMDComponentTypeWrapperTest {
 
-    ///////////////////////////////
+    //////////////////////////////////////////////////
     private CMDComponentType copyCMDComponentType(CMDComponentType newcomponent) {
        
        CMDComponentType component= new CMDComponentType();
        
-       // filing in the important fields: fiename 
+       // filing in filename 
        component.setFilename(newcomponent.getFilename());
        
-       // filing in the important fields: the list of child components
+       // filing in the list of child components
        List<CMDComponentType> childcomponents = component.getCMDComponent();
        boolean emptynesscheck=childcomponents.isEmpty();
@@ -51 +51 @@
     
     
-    //////////////////////////
+    ////////////////////////////////////////////
+    
+    
     private CMDComponentType makeTestComponent(){
        CMDComponentType component= new CMDComponentType();
        
        // fil-in filename
-      component.setFilename("rhabarber");
-      assertEquals(component.getFilename(), "rhabarber");
+      component.setFilename("mini0.619");
+      assertEquals(component.getFilename(), "mini0.619");
       
        // fil-in child components
@@ -79 +81 @@
     
     
-    ///////////////////////////////
+    /////////////////////////////////////////////
     // checks if all the filenames related to the component are nulls
     private void checkNullnessOfFilenamesInComponent(CMDComponentType component){
@@ -91 +93 @@
     
     ///////////////////////////////
+    // checks if all the filenames related to the list of component are nulls
     private void checkNullnessOfFilenamesInListOfComponents(List<CMDComponentType> listofcomponents){
         
@@ -102 +105 @@
     
     
-    ///////////////////////////////
-    // true if all the filenames for the inpit component are not null
+    /////////////////////////////////////////////////
+    // returns true if all the filenames related to the input component are not null
     private boolean checkNonNullnessOfFilenamesInComponent(CMDComponentType component){
       
@@ -116 +119 @@
     
     ////////////////// /////////////
-    // true if all thefilenames in the list of components are not null
+    // returns true if all thefilenames related to the list of components are not null
     private boolean checkNonNullnessOfFilenamesInListOfComponents(List<CMDComponentType> listofcomponents){
         
@@ -129 +132 @@
     }
     
-    ///////////////////////////
+    ////////////////////////////////////////
+    
+    
     @Test    
     public void setFileNamesToNullTestComponent(){
        
       
-      /////////////////////////////////////////////////////
-      // check on a fresh (empty)  CMDComponentType
+      
+      // check  a fresh (empty)  CMDComponentType
       CMDComponentType emptycomponent= new CMDComponentType();
       CMDComponentTypeWrapper emptywrapper = new CMDComponentTypeWrapper(emptycomponent);
@@ -143 +148 @@
       
       
-      /////////////////////////////////////////////////////
-      // check on  the test component  CMDComponentType
+      // check  the test component  CMDComponentType
       
       CMDComponentType component= makeTestComponent();
@@ -153 +157 @@
       checkNullnessOfFilenamesInComponent(component);
       
-      
-      
-      
-      
-    }
-    
+    }
+    
+    ///////////////////////////////////////
     
     @Test    
@@ -174 +175 @@
       listofcomponents.add(anothercomponent);
       
+      // run the nuller 
       CMDComponentTypeWrapper wrapper = new CMDComponentTypeWrapper(componentspec);
       wrapper.setFileNamesToNull();
@@ -180 +182 @@
     }
       
-      
+   
+    
+    //////////////////////////////////////////////////////////////
+    /// Testing on the profile XML file 
+    // There are a few auxiliary methods preceeding the test method, which is at the end
     
     // adding dummy filenames to a component
@@ -190 +196 @@
         
         List<CMDComponentType> listofcomponents = component.getCMDComponent();
-        
         addDummyFilenamesToListOfComponents(listofcomponents);
         
@@ -196 +201 @@
     }
     
-    // adding dummy filenames to list of  component
+    // adding dummy filenames to the list of  components
     private void addDummyFilenamesToListOfComponents(List<CMDComponentType> listofcomponents){
         
@@ -215 +220 @@
           
           List<CMDComponentType> listofcomponents = compspec.getCMDComponent();
-          
           addDummyFilenamesToListOfComponents(listofcomponents);
           
           assertTrue(checkNonNullnessOfFilenamesInListOfComponents(listofcomponents));
           
-          
-          
           return compspec;
           
       }
       
-       //writing profile file into the directory 
-      private void writeSpecToFile(CMDComponentSpec compspec) throws IOException, JAXBException {
+       //writing profile file compspec  into the file filename
+      private void writeSpecToFile(CMDComponentSpec compspec, String filename) throws IOException, JAXBException {
           
         String  os = RegistryTestHelper.getXml(compspec);
-        
         
         FileOutputStream fop = null;
         File file;
         
-        file = new File("src/test/resources/xml/Olhatest.xml");
+        file = new File(filename);
         fop = new FileOutputStream(file);
         
@@ -248 +249 @@
       }
       
-      @Test
-      
+      
+      // creating the profile with filenames filled by "Dummy" and writing it into the file 
       public void writeDummiedXML() throws IOException, JAXBException{
           
           CMDComponentSpec compspec=makeTestSpecFromLargeProfile();
-          writeSpecToFile(compspec);
-          
-          
-          
-      }
-        
-      
-      private String getProfileContentFromFile(String filename) throws IOException {
-        InputStream dummiedProfileStream = RegistryTestHelper.class.getResourceAsStream(filename);
-        try {
-            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(dummiedProfileStream));
-            StringBuilder profileStringBuilder = new StringBuilder();
-            String line;
-            while (null != (line = bufferedReader.readLine())) {
-                profileStringBuilder.append(line);
-            }
-            return profileStringBuilder.toString();
-        } finally {
-            dummiedProfileStream.close();
-        }
-    }
-      
+          writeSpecToFile(compspec, "src/test/resources/xml/largeProfileDummyFilenames.xml");
+          
+          
+          
+      }
+        
+      
+      
+      /////////////////////////////////////////////
+      // testing the nuller on the XML file
             
       @Test
@@ -280 +269 @@
       public void setFileNamesToNullTestFile() throws IOException, JAXBException {
           
-         CMDComponentSpec compspec  = makeTestSpecFromLargeProfile();
-         writeSpecToFile(compspec);
-         
-         String dummiedcontent = getProfileContentFromFile("xml/Olhatest.xml");
+         writeDummiedXML();
+         
+         String dummiedcontent = RegistryTestHelper.getProfileContentFromFile("/xml/largeProfileDummyFilenames.xml");
          CMDComponentSpec newcompspec  = RegistryTestHelper.getComponentFromString(dummiedcontent); // calling unmarchaller
          

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java

@@ -167 +167 @@
         }
     }
-
+    
+    
+    // Olha was here
+    // a method similar to getLargeProfileContent(), but allowing to get profile from any fil, not only largeProfile.xml 
+    public static String getProfileContentFromFile(String filename) throws IOException {
+        InputStream largeProfileStream = RegistryTestHelper.class.getResourceAsStream(filename);
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(largeProfileStream));
+            StringBuilder profileStringBuilder = new StringBuilder();
+            String line;
+            while (null != (line = bufferedReader.readLine())) {
+                profileStringBuilder.append(line);
+            }
+            return profileStringBuilder.toString();
+        } finally {
+            largeProfileStream.close();
+        }
+    }
+
+    //////////////////////
+    
+    
     public static CMDComponentSpec getComponentFromString(String contentString) throws JAXBException {
         return MDMarshaller.unmarshal(CMDComponentSpec.class, getComponentContent(contentString), MDMarshaller.getCMDComponentSchema());