Changeset 4550 for ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestRunner.java

Timestamp:

02/25/14 09:35:47 (10 years ago)

Author:

twagoo

Message:

Fixed errors due to schema change allowing only one root element in a profile or component (see r4525)

File:

• ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestRunner.java (modified) (13 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/CMDComponentSetFilenamesToNullTestRunner.java

@@ -11 +11 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.JAXBException;
@@ -16 +17 @@
 
 /**
- * non-automated developers. test, with and input (a valid
- *         component/prifile xml file and a path to it) and the output (the file
- *         where all filenames are set to null, in the same directory as the
- *         input file)
- * @author olhsha 
+ * non-automated developers. test, with and input (a valid component/prifile xml
+ * file and a path to it) and the output (the file where all filenames are set
+ * to null, in the same directory as the input file)
+ *
+ * @author olhsha
  * @author George.Georgovassilis@mpi.nl
  */
@@ -26 +27 @@
 
     /**
-     * 
+     *
      * @author olhsha
      */
     /**
      * makes a new component (with filled-in filename)
-     * 
-     * @param filename
-     *            is assigned to the filed "filename" of the new component
-     * @param childcomponents
-     *            is assigned to the list of child components of the new
-     *            component
+     *
+     * @param filename is assigned to the filed "filename" of the new component
+     * @param childcomponents is assigned to the list of child components of the
+     * new component
      * @return the reference to the new component
      */
     protected CMDComponentType makeTestComponent(String filename,
-            List<CMDComponentType> childcomponents) {
-
-        CMDComponentType component = new CMDComponentType();
-        component.setFilename(filename);
-        List<CMDComponentType> kids = component.getCMDComponent();
-        assertFalse(kids == null);
-        assertEquals(kids.size(), 0);
-        if (childcomponents != null) {
-            kids.addAll(childcomponents);
-        }
-        ;
-        return component;
+            List<CMDComponentType> childcomponents) {
+
+        CMDComponentType component = new CMDComponentType();
+        component.setFilename(filename);
+        List<CMDComponentType> kids = component.getCMDComponent();
+        assertFalse(kids == null);
+        assertEquals(kids.size(), 0);
+        if (childcomponents != null) {
+            kids.addAll(childcomponents);
+        }
+        ;
+        return component;
     }
 
@@ -58 +57 @@
      */
     private void checkNullnessOfFilenamesInComponent(CMDComponentType component) {
-        assertEquals(component.getFilename(), null);
-        checkNullnessOfFilenamesInListOfComponents(component.getCMDComponent());
+        assertEquals(component.getFilename(), null);
+        checkNullnessOfFilenamesInListOfComponents(component.getCMDComponent());
     }
 
@@ -66 +65 @@
      */
     private void checkNullnessOfFilenamesInListOfComponents(
-            List<CMDComponentType> listofcomponents) {
-        for (CMDComponentType currentcomponent : listofcomponents) {
-            checkNullnessOfFilenamesInComponent(currentcomponent);
-        }
+            List<CMDComponentType> listofcomponents) {
+        for (CMDComponentType currentcomponent : listofcomponents) {
+            checkNullnessOfFilenamesInComponent(currentcomponent);
+        }
     }
 
@@ -77 +76 @@
      */
     private boolean checkNonNullnessOfFilenamesInComponent(
-            CMDComponentType component) {
-
-        String filename = component.getFilename();
-        System.out.println(filename);
-        boolean check = (filename == null);
-        if (check) {
-            return false;
-        }
-        return checkNonNullnessOfFilenamesInListOfComponents(component
-                .getCMDComponent());
+            CMDComponentType component) {
+
+        String filename = component.getFilename();
+        System.out.println(filename);
+        boolean check = (filename == null);
+        if (check) {
+            return false;
+        }
+        return checkNonNullnessOfFilenamesInListOfComponents(component
+                .getCMDComponent());
     }
 
@@ -94 +93 @@
      */
     private boolean checkNonNullnessOfFilenamesInListOfComponents(
-            List<CMDComponentType> listofcomponents) {
-        boolean check;
-        for (CMDComponentType currentcomponent : listofcomponents) {
-            check = checkNonNullnessOfFilenamesInComponent(currentcomponent);
-            if (!check) {
-                return false;
-            }
-        }
-        return true;
+            List<CMDComponentType> listofcomponents) {
+        boolean check;
+        for (CMDComponentType currentcomponent : listofcomponents) {
+            check = checkNonNullnessOfFilenamesInComponent(currentcomponent);
+            if (!check) {
+                return false;
+            }
+        }
+        return true;
     }
 
@@ -109 +108 @@
      */
     private void addDummyFilenamesToComponent(CMDComponentType component) {
-        if (component != null) {
-            component.setFilename("Dummy");
-            List<CMDComponentType> listofcomponents = component
-                    .getCMDComponent();
-            addDummyFilenamesToListOfComponents(listofcomponents);
-        }
+        if (component != null) {
+            component.setFilename("Dummy");
+            List<CMDComponentType> listofcomponents = component
+                    .getCMDComponent();
+            addDummyFilenamesToListOfComponents(listofcomponents);
+        }
     }
 
@@ -121 +120 @@
      */
     private void addDummyFilenamesToListOfComponents(
-            List<CMDComponentType> listofcomponents) {
-        for (CMDComponentType currentcomponent : listofcomponents) {
-            addDummyFilenamesToComponent(currentcomponent);
-        }
+            List<CMDComponentType> listofcomponents) {
+        for (CMDComponentType currentcomponent : listofcomponents) {
+            addDummyFilenamesToComponent(currentcomponent);
+        }
     }
 
@@ -131 +130 @@
      */
     private CMDComponentSpec makeTestFromFile(String filename)
-            throws IOException, JAXBException {
-        FileInputStream is = new FileInputStream(filename);
-        String profilestring = RegistryTestHelper.getStringFromStream(is);
-        CMDComponentSpec compspec = RegistryTestHelper
-                .getComponentFromString(profilestring); // calling unmarchaller
-        List<CMDComponentType> listofcomponents = compspec.getCMDComponent();
-        addDummyFilenamesToListOfComponents(listofcomponents);
-        assertTrue(checkNonNullnessOfFilenamesInListOfComponents(listofcomponents));
-        return compspec;
+            throws IOException, JAXBException {
+        FileInputStream is = new FileInputStream(filename);
+        String profilestring = RegistryTestHelper.getStringFromStream(is);
+        CMDComponentSpec compspec = RegistryTestHelper
+                .getComponentFromString(profilestring); // calling unmarchaller
+        List<CMDComponentType> listofcomponents = Collections.singletonList(compspec.getCMDComponent());
+        addDummyFilenamesToListOfComponents(listofcomponents);
+        assertTrue(checkNonNullnessOfFilenamesInListOfComponents(listofcomponents));
+        return compspec;
     }
 
@@ -147 +146 @@
      */
     private void writeDummiedXML(String filenamein, String filenameout)
-            throws IOException, JAXBException {
-        CMDComponentSpec compspec = makeTestFromFile(filenamein);
-        String os = RegistryTestHelper.getXml(compspec);
-        RegistryTestHelper.writeStringToFile(os, filenameout);
+            throws IOException, JAXBException {
+        CMDComponentSpec compspec = makeTestFromFile(filenamein);
+        String os = RegistryTestHelper.getXml(compspec);
+        RegistryTestHelper.writeStringToFile(os, filenameout);
     }
 
@@ -157 +156 @@
      */
     private void setFileNamesToNullInFile(String dirName, String fileNameInit,
-            String fileNameDummied, String fileNameUnDummied)
-            throws IOException, JAXBException {
-
-        String path = RegistryTestHelper.openTestDir(dirName);
-        writeDummiedXML(path + fileNameInit, path + fileNameDummied);
-
-        FileInputStream is = new FileInputStream(path + fileNameDummied);
-        String dummiedcontent = RegistryTestHelper.getStringFromStream(is);
-        CMDComponentSpec compspec = RegistryTestHelper
-                .getComponentFromString(dummiedcontent); // calling unmarchaller
-
-        List<CMDComponentType> listofcomponents = compspec.getCMDComponent();
-
-        IComponentRegistryRestService testrestservice = new ComponentRegistryRestService();
-        testrestservice.setFileNamesFromListToNull(listofcomponents);
-        checkNullnessOfFilenamesInListOfComponents(listofcomponents);
-
-        String os = RegistryTestHelper.getXml(compspec);
-        RegistryTestHelper.writeStringToFile(os, path + fileNameUnDummied);
+            String fileNameDummied, String fileNameUnDummied)
+            throws IOException, JAXBException {
+
+        String path = RegistryTestHelper.openTestDir(dirName);
+        writeDummiedXML(path + fileNameInit, path + fileNameDummied);
+
+        FileInputStream is = new FileInputStream(path + fileNameDummied);
+        String dummiedcontent = RegistryTestHelper.getStringFromStream(is);
+        CMDComponentSpec compspec = RegistryTestHelper
+                .getComponentFromString(dummiedcontent); // calling unmarchaller
+
+        List<CMDComponentType> listofcomponents = Collections.singletonList(compspec.getCMDComponent());
+
+        IComponentRegistryRestService testrestservice = new ComponentRegistryRestService();
+        testrestservice.setFileNamesFromListToNull(listofcomponents);
+        checkNullnessOfFilenamesInListOfComponents(listofcomponents);
+
+        String os = RegistryTestHelper.getXml(compspec);
+        RegistryTestHelper.writeStringToFile(os, path + fileNameUnDummied);
     }
 
@@ -184 +183 @@
      */
     public static void main(String args[]) throws java.io.IOException,
-            JAXBException {
-
-        BufferedReader buffer = new BufferedReader(new InputStreamReader(
-                System.in));
-
-        System.out.println("");
-        System.out
-                .print("Sub-directory (of target/) name? (up to 32 symbols): ");
-        String dirName = buffer.readLine();
-        System.out.println("");
-        System.out
-                .println("(Watch out: this is a temorary directory, which is removed after any new clean+build)");
-        System.out.println(dirName);
-
-        System.out.println("");
-        System.out.println("Check if your file is in this temorary directory");
-        System.out.print("and input the file name (up to 32 symbols): ");
-        String fileName = buffer.readLine();
-        System.out.println(fileName);
-
-        System.out.println("Bedankt, ff wachten .. ");
-
-        String fileNameDummied = "Dummied" + fileName;
-        String fileNameUnDummied = "Nulled" + fileName;
-
-        CMDComponentSetFilenamesToNullTestRunner helper = new CMDComponentSetFilenamesToNullTestRunner();
-
-        helper.setFileNamesToNullInFile(dirName, fileName, fileNameDummied,
-                fileNameUnDummied);
-
-        System.out.println("Now look up the directory target/" + dirName);
+            JAXBException {
+
+        BufferedReader buffer = new BufferedReader(new InputStreamReader(
+                System.in));
+
+        System.out.println("");
+        System.out
+                .print("Sub-directory (of target/) name? (up to 32 symbols): ");
+        String dirName = buffer.readLine();
+        System.out.println("");
+        System.out
+                .println("(Watch out: this is a temorary directory, which is removed after any new clean+build)");
+        System.out.println(dirName);
+
+        System.out.println("");
+        System.out.println("Check if your file is in this temorary directory");
+        System.out.print("and input the file name (up to 32 symbols): ");
+        String fileName = buffer.readLine();
+        System.out.println(fileName);
+
+        System.out.println("Bedankt, ff wachten .. ");
+
+        String fileNameDummied = "Dummied" + fileName;
+        String fileNameUnDummied = "Nulled" + fileName;
+
+        CMDComponentSetFilenamesToNullTestRunner helper = new CMDComponentSetFilenamesToNullTestRunner();
+
+        helper.setFileNamesToNullInFile(dirName, fileName, fileNameDummied,
+                fileNameUnDummied);
+
+        System.out.println("Now look up the directory target/" + dirName);
     }
 }