Changeset 2184

Timestamp:

08/30/12 15:42:11 (12 years ago)

Author:

olhsha

Message:

a bit of refactoring

Location:

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

Files:

• java/clarin/cmdi/componentregistry/CMDComponentTypeWrapperTest.java (modified) (4 diffs)
• resources/xml/A.xml (added)
• resources/xml/ADummyFilenames.xml (added)
• resources/xml/AUndummied.xml (added)
• resources/xml/Component1.xml (modified) (1 diff)
• resources/xml/Component2.xml (modified) (1 diff)
• resources/xml/rssTest.xml (modified) (3 diffs)

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

@@ -214 +214 @@
     
       // adds dummy filenames to the content of largeProfile.XML  
-      private  CMDComponentSpec makeTestSpecFromLargeProfile() throws IOException, JAXBException {
-          
-          String largeprofilestring = RegistryTestHelper.getLargeProfileContent(); // reading from the file
+      private  CMDComponentSpec makeTestFromFile(String filename) throws IOException, JAXBException {
+          
+          String largeprofilestring = RegistryTestHelper.getProfileContentFromFile(filename);
           CMDComponentSpec compspec=RegistryTestHelper.getComponentFromString(largeprofilestring); // calling unmarchaller
           
@@ -251 +251 @@
       
       // 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, "src/test/resources/xml/largeProfileDummyFilenames.xml");
-          
+      public void writeDummiedXML(String filenamein, String filenameout) throws IOException, JAXBException{
+          
+          CMDComponentSpec compspec=makeTestFromFile(filenamein);
+          writeSpecToFile(compspec, filenameout);
       }
         
@@ -265 +264 @@
       @Test
       
-      public void setFileNamesToNullTestFile() throws IOException, JAXBException {
-          
-         writeDummiedXML();
+      public void setFileNamesToNullTestFile1() throws IOException, JAXBException {
+          
+         writeDummiedXML("/xml/largeProfile.xml", "src/test/resources/xml/largeProfileDummyFilenames.xml");
+         
          
          String dummiedcontent = RegistryTestHelper.getProfileContentFromFile("/xml/largeProfileDummyFilenames.xml");
@@ -282 +282 @@
          
       }
-      
-      
-     
-    }
-    
-    
-    
-    
-
+      ////////////////////////////////////
+      
+      @Test
+      
+      public void setFileNamesToNullTestFile2() throws IOException, JAXBException {
+          
+         writeDummiedXML("/xml/A.xml", "src/test/resources/xml/ADummyFilenames.xml");
+         
+         
+         String  dummiedcontent= RegistryTestHelper.getProfileContentFromFile("/xml/ADummyFilenames.xml");
+         assertTrue(dummiedcontent != null);
+         CMDComponentSpec newcompspec  = RegistryTestHelper.getComponentFromString(dummiedcontent); // calling unmarchaller
+         assertTrue(newcompspec != null);
+         
+         CMDComponentTypeWrapper wrapper = new CMDComponentTypeWrapper(newcompspec);
+         
+         wrapper.setFileNamesToNull();
+         
+         checkNullnessOfFilenamesInListOfComponents(newcompspec.getCMDComponent());
+         writeSpecToFile(newcompspec, "src/test/resources/xml/AUndummied.xml");
+         
+         
+      }
+     
+    }
+    
+    
+    
+    
+

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/Component1.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <componentDescription xmlns:ns2="http://www.w3.org/1999/xlink">
-    <id>clarin.eu:cr1:c_1346252981279</id>
+    <id>clarin.eu:cr1:c_1346315576463</id>
     <description>description1dum</description>
     <name>name1dum</name>
-    <registrationDate>2012-08-29T15:12:50+00:00</registrationDate>
+    <registrationDate>2012-08-30T08:36:02+00:00</registrationDate>
     <creatorName>God</creatorName>
     <userId>uid1dum</userId>

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/Component2.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <componentDescription xmlns:ns2="http://www.w3.org/1999/xlink">
-    <id>clarin.eu:cr1:c_1346252981280</id>
+    <id>clarin.eu:cr1:c_1346315576464</id>
     <description>description2dum</description>
     <name>name2dum</name>
-    <registrationDate>2012-08-29T15:12:50+00:00</registrationDate>
+    <registrationDate>2012-08-30T08:36:02+00:00</registrationDate>
     <creatorName>Allah</creatorName>
     <userId>uid2dum</userId>

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/resources/xml/rssTest.xml

@@ -1 @@
-,<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <rss>
     <channel>
@@ -7 +7 @@
             <link>href1dum</link>
             <author>God</author>
-            <pubDate>2012-08-29T15:05:08+00:00</pubDate>
+            <pubDate>2012-08-29T15:12:50+00:00</pubDate>
         </item>
         <item>
@@ -14 +14 @@
             <link>href2dum</link>
             <author>Allah</author>
-            <pubDate>2012-08-29T15:05:08+00:00</pubDate>
+            <pubDate>2012-08-29T15:12:50+00:00</pubDate>
         </item>
     </channel>