Changeset 2194

Timestamp:

09/03/12 15:01:10 (12 years ago)

Author:

olhsha

Message:

refactoring of after the discussion with Twan

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry

Files:

• MyTestXmls (added)
• MyTestXmls/MyTestXmlsA.xml (added)
• MyTestXmls/MyTestXmlsADummiedFilenames.xml (added)
• MyTestXmls/MyTestXmlsAUnDummiedFilenames.xml (added)
• MyTestXmls/MyTestXmlsComponent1.xml (added)
• MyTestXmls/MyTestXmlsComponent2.xml (added)
• MyTestXmls/MyTestXmlsLargeProfileDummyFilenames.xml (added)
• MyTestXmls/MyTestXmlsLargeProfileUnDummiedFilenames.xml (added)
• MyTestXmls/MyTestXmlslargeProfile.xml (added)
• MyTestXmls/MyTestXmlsrssTest.xml (added)
• src/main/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapper.java (deleted)
• src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (3 diffs)
• src/test/java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java (deleted)
• src/test/java/clarin/cmdi/componentregistry/RssCreatorTest.java (modified) (5 diffs)
• src/test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestHelper.java (added)
• src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (3 diffs)
• src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java (modified) (4 diffs)
• src/test/resources/xml/A.xml (deleted)
• src/test/resources/xml/ADummyFilenames.xml (deleted)
• src/test/resources/xml/AUndummied.xml (deleted)
• src/test/resources/xml/Component1.xml (deleted)
• src/test/resources/xml/Component2.xml (deleted)
• src/test/resources/xml/largeProfileDummyFilenames.xml (deleted)
• src/test/resources/xml/largeProfileUndummied.xml (deleted)
• src/test/resources/xml/rssTest.xml (deleted)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.rest;
 
-import clarin.cmdi.componentregistry.CMDComponentTypeWrapper;
+
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryException;
@@ -799 +799 @@
                 
                 // Olha: removing filename from spec before it gets extended!!! recursion over all the components
-                CMDComponentTypeWrapper setnull = new CMDComponentTypeWrapper(spec);
+                setFileNamesFromListToNull(spec.getCMDComponent());
                
                
@@ -938 +938 @@
     
     
+    /// two muchually recursive methods below are used to set filenames of components (and their child components) to null
+    /*
+     * @param List<CMDComponentType> listofcomponents the list of components whose filenames (and the children's names) are to be set to null
+     */
+    public void setFileNamesFromListToNull(List<CMDComponentType> listofcomponents){ 
+     
+        for (CMDComponentType currentcomponent : listofcomponents) {
+                setFileNamesToNullCurrent(currentcomponent);
+                } 
+    
+    }
+    
+    /*
+     * @param CMDComponentType currentcomponent the component whose filename (and whose children filenames) is to be set to null
+     */
+    
+    public void setFileNamesToNullCurrent(CMDComponentType currentcomponent){ 
+     
+      currentcomponent.setFilename(null);
+      setFileNamesFromListToNull(currentcomponent.getCMDComponent());
+    
+    }
+    
+    ////////////////////////////////////////////////
+    
+    
 }

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

@@ -14 +14 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -115 +116 @@
     
     
-    /////////////////////////////////////////
-    // writing ByteArrayOutputStream into the file filename
-      private void writeStreamToFile(ByteArrayOutputStream os, String filename) throws IOException, JAXBException {
-         
-        FileOutputStream fop = null;
-        File file;
-        
-        file = new File(filename);
-        fop = new FileOutputStream(file);
-        
-        fop.write(os.toByteArray());
-        
-        fop.flush();
-        fop.close();
- 
-        System.out.println("the rss is written into the file and saved");
- 
-        
-      }
-    
    
    
@@ -160 +141 @@
         MDMarshaller.marshal(cdesc, os);
         
-        writeStreamToFile(os, filename);
+        RegistryTestHelper.writeStreamToFile(os, filename);
        
     }
@@ -192 +173 @@
     public void testRssChannelAndMarshal() throws IOException, JAXBException {
         
+         String dirName="MyTestXmls";
+         File testDir = new File(dirName);
+         testDir.mkdir();
+        
+         String path = new File(testDir, dirName).getAbsolutePath();
+         
+         String comp1="Component1.xml";
+         String comp2="Component2.xml";
+         String rssOut="rssTest.xml";
+                  
+        
+        
+        
         ComponentDescription cdesc1=makeTestComponent1();
-        writeComponentIntoFile(cdesc1, "src/test/resources/xml/Component1.xml");
+        writeComponentIntoFile(cdesc1, path+comp1);
         
         ComponentDescription cdesc2=makeTestComponent2();
-        writeComponentIntoFile(cdesc2, "src/test/resources/xml/Component2.xml");
-        
-        
-        
-        InputStream  is1 = RegistryTestHelper.getComponentContent(RegistryTestHelper.getProfileContentFromFile("/xml/Component1.xml"));
+        writeComponentIntoFile(cdesc2, path+comp2);
+        
+        
+        
+        FileInputStream  is1 = new FileInputStream(path+comp1);
         ComponentDescription desc1 = MDMarshaller.unmarshal(ComponentDescription.class, is1, null) ;
         
-        InputStream  is2 = RegistryTestHelper.getComponentContent(RegistryTestHelper.getProfileContentFromFile("/xml/Component2.xml"));
+        FileInputStream  is2 = new FileInputStream(path+comp2);
         ComponentDescription desc2 = MDMarshaller.unmarshal(ComponentDescription.class, is2, null) ;
         
@@ -229 +223 @@
         MDMarshaller.marshal(rss, osrss);
         
-        writeStreamToFile(osrss, "src/test/resources/xml/rssTest.xml");
-        
-       
-    }
-    
-    
-     
-    
-      
-    
-    
-    //////////////////////////////////////////////
-    /* @Test
-      public  void fileLargeProfileTestToRssItem() throws IOException, JAXBException {
-         
-        InputStream largeProfileStream = RegistryTestHelper.class.getResourceAsStream("/xml/largeProfile.xml");
-          
-        AbstractDescription desc=MDMarshaller.unmarshal(ComponentDescription.class, largeProfileStream, null);
-        
-        assertTrue(desc !=null);
-          
-        RssCreator creator = new RssCreator(desc);
-        RssItem rss = creator.toRssItem();
-        
-        //assertTrue(rss !=null);
-        
-        
-        System.out.println(rss.getAuthor());
-        System.out.println(rss.getDescription());
-        System.out.println(rss.getLink());
-        System.out.println(rss.getPubDate());
-        System.out.println(rss.getTitle());
-        
-        
-        writeRssToFile(rss, "src/test/resources/xml/rssOfLargeProfile.xml"); 
-        
-        
-        
-          
-      }
-      */
+        RegistryTestHelper.writeStreamToFile(osrss, path+rssOut);
+        
+       
+    }
+    
+    
+   
 }

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

@@ -5 +5 @@
 import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.components.CMDComponentType;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
@@ -17 +18 @@
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.multipart.FormDataMultiPart;
-import java.awt.image.ComponentSampleModel;
 import java.io.ByteArrayInputStream;
 import java.util.Date;
@@ -1143 +1143 @@
     
     
+    
+    /////////////////////////////////
+    @Test 
+    public void testSetFilenamesToNullOnTestComponent() throws Exception {
+        
+       CMDComponentSpec spec = RegistryTestHelper.getTestComponent();
+       
+       
+       List<CMDComponentType> listofcomponents = spec.getCMDComponent();
+       CMDComponentSetFilenamesToNullTestHelper helper = new CMDComponentSetFilenamesToNullTestHelper();
+       
+       helper.addDummyFilenamesToListOfComponents(listofcomponents);
+       assertTrue(helper.checkNonNullnessOfFilenamesInListOfComponents(listofcomponents));
+       CMDComponentType compaux = helper.makeTestComponent();
+       listofcomponents.add(compaux);
+       
+       
+       ComponentRegistryRestService restservice = helper.getTestRestService();
+       restservice.setFileNamesFromListToNull(spec.getCMDComponent());
+       helper.checkNullnessOfFilenamesInListOfComponents(listofcomponents);
+    }
+    
+    ///////////////////////////////////
+     @Test 
+     public void testSetFilenamesToNullOnLargeProfile() throws Exception {
+      
+      
+      String largeprofilestring = RegistryTestHelper.getLargeProfileContent();
+      CMDComponentSpec spec=RegistryTestHelper.getComponentFromString(largeprofilestring); // calling unmarchaller
+      
+      
+      List<CMDComponentType> listofcomponents = spec.getCMDComponent();
+      CMDComponentSetFilenamesToNullTestHelper helper = new CMDComponentSetFilenamesToNullTestHelper();
+       
+       helper.addDummyFilenamesToListOfComponents(listofcomponents);
+       assertTrue(helper.checkNonNullnessOfFilenamesInListOfComponents(listofcomponents));
+       
+       ComponentRegistryRestService restservice = helper.getTestRestService();
+       restservice.setFileNamesFromListToNull(spec.getCMDComponent());
+       helper.checkNullnessOfFilenamesInListOfComponents(listofcomponents);
+      
+    }
+    
 }

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

@@ -20 +20 @@
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStreamReader;
 
@@ -27 +29 @@
  */
 public final class RegistryTestHelper {
+
+    
 
     private RegistryTestHelper() {
@@ -153 +157 @@
     }
 
+    
+    public static String getStringFromStream(InputStream largeProfileStream) throws IOException {
+        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 String getLargeProfileContent() throws IOException {
         InputStream largeProfileStream = RegistryTestHelper.class.getResourceAsStream("/xml/largeProfile.xml");
-        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();
-        }
-    }
-    
-    
-    // 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();
-        }
-    }
+        return getStringFromStream(largeProfileStream);
+    }
+    
+    
+    
 
     //////////////////////
@@ -281 +276 @@
         return matcher.find() && !matcher.find(); //find only one
     }
+    
+    
+     // helping method writing byte[] bytes into the filename  
+      public static void writeBytesToFile(byte[] bytes, String filename) throws IOException, JAXBException {
+                 
+        File file = new File(filename);
+        FileOutputStream fop = new FileOutputStream(file);
+        
+        fop.write(bytes);
+        
+        fop.flush();
+        fop.close();
+ 
+        
+      }
+    
+    
+    
+      //helping method writing String str  into the file filename
+      public static void writeStringToFile(String str, String filename) throws IOException, JAXBException {
+          
+        writeBytesToFile(str.getBytes(), filename);
+ 
+        
+      }
+      
+      /////////////////////////////////////////
+    // writing ByteArrayOutputStream into the file filename
+      public static void writeStreamToFile(ByteArrayOutputStream os, String filename) throws IOException, JAXBException {
+          
+        writeBytesToFile(os.toByteArray(), filename);
+ 
+        
+      }
 }