perfsonar development work

Author: psnc.pietrzak
Date: 2010-04-26 15:35:05 +0100 (Mon, 26 Apr 2010)
New Revision: 5594

Added:
   
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/TemplateEngineTest.java
Removed:
   
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigurationMigratorTest.java
Modified:
   
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/AllMigrationTests.java
   
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
Log:
Code refactoring

Modified: 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/AllMigrationTests.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/AllMigrationTests.java
 2010-04-26 14:16:05 UTC (rev 5593)
+++ 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/AllMigrationTests.java
 2010-04-26 14:35:05 UTC (rev 5594)
@@ -15,7 +15,7 @@
                         "Migration tool from base-1 to base-2 test cases");
                //$JUnit-BEGIN$
                suite.addTestSuite(ConfigFilesCollectionTest.class);
-               suite.addTestSuite(ConfigurationMigratorTest.class);
+               suite.addTestSuite(TemplateEngineTest.class);
                suite.addTest(AllGrammarTests.suite());
                //$JUnit-END$
                return suite;

Modified: 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
 2010-04-26 14:16:05 UTC (rev 5593)
+++ 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
 2010-04-26 14:35:05 UTC (rev 5594)
@@ -45,7 +45,7 @@
        }
 
        public void testGetFiles() throws Exception {
-               assertEquals(createExpectedConfigFiles(".properties"), 
configCollection.getFiles());
+               
assertCollectionEquals(createExpectedConfigFiles(".properties"), 
configCollection.getFiles());
        }
 
        public void testGetFilesDirectoryDoesNotExist() throws IOException {
@@ -98,4 +98,8 @@
                expected.add(new File(CONFIG_PATH + File.separator + "wizard" 
+ suffix));
                return expected;
        }
+       
+       private void assertCollectionEquals(Collection<File> expected, 
Collection<File> actual) {
+               assertEquals(expected.toString(), actual.toString());
+       }
 }

Deleted: 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigurationMigratorTest.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigurationMigratorTest.java
 2010-04-26 14:16:05 UTC (rev 5593)
+++ 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigurationMigratorTest.java
 2010-04-26 14:35:05 UTC (rev 5594)
@@ -1,77 +0,0 @@
-package org.perfsonar.base2.service.configuration.migration;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-
-import 
org.perfsonar.base2.service.configuration.migration.ConfigFilesCollection;
-import org.perfsonar.base2.service.configuration.migration.TemplateEngine;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
- */
-public class ConfigurationMigratorTest extends TestCase {
-
-       TemplateEngine migrator;
-       
-       protected void setUp() throws Exception {
-               super.setUp();
-               migrator = new TemplateEngine(new 
ConfigFilesCollection(getConfigPath()).loadProperties());
-       }
-
-       private String getConfigPath() {
-               return "src" + File.separator + "test" + File.separator + 
"java" + File.separator + 
TemplateEngine.class.getPackage().getName().replace(".", File.separator);
-       }
-       
-       public void testCreateFromTemplateWhereTemplateIsaDirectory() {
-               try {
-                       migrator.createFileFromTemplate(new 
File(getConfigPath()), "configuration.xml");
-                       fail("IOException not thrown.");
-               } catch (IOException ex) { }
-       }
-       public void testCreateFromTemplateWhereTemplateDoesNotExist() throws 
IOException {
-               try {
-                       migrator.createFileFromTemplate(new 
File(getConfigPath() + File.separator + "does_not_exist"), 
"configuration.xml");
-                       fail("FileNotFoundException not thrown.");
-               } catch (FileNotFoundException ex) { }
-       }
-       public void testCreateFromTemplateWhereFileIsaDirectory() {
-               try {
-                       migrator.createFileFromTemplate(new 
File(getConfigPath() + File.separator + "configuration.xml.template"), 
getConfigPath());
-                       fail("IOException not thrown.");
-               } catch (IOException ex) { }
-       }
-       public void testCreateFromTemplate() throws IOException {
-               assertEquals(new File(getConfigPath() + File.separator + 
"expected.xml"), migrator.createFileFromTemplate(new File(getConfigPath() + 
File.separator + "configuration.xml.template"), getConfigPath() + 
File.separator + "configuration.xml"));
-               assertTrue(new File(getConfigPath() + File.separator + 
"configuration.xml").delete());
-       }
-       
-       private void assertEquals(File expected, File actual) throws 
IOException {
-               assertEquals(toString(expected), toString(actual));
-       }
-
-       private String toString(File file) throws IOException {
-               final BufferedReader reader = new BufferedReader(new 
FileReader(file));
-               final StringBuffer result = new StringBuffer();
-               boolean first = true;
-               for (String line = reader.readLine(); line != null; line  = 
reader.readLine()) {
-                       if (first == false)
-                               result.append("\n");
-                       else
-                               first = false;
-                       result.append(line);
-               }
-               reader.close();
-               
-               return result.toString();
-       }
-       
-       protected void tearDown() throws Exception {
-               super.tearDown();
-       }
-
-}

Copied: 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/TemplateEngineTest.java
 (from rev 5593, 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigurationMigratorTest.java)
===================================================================
--- 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/TemplateEngineTest.java
                                (rev 0)
+++ 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/TemplateEngineTest.java
        2010-04-26 14:35:05 UTC (rev 5594)
@@ -0,0 +1,77 @@
+package org.perfsonar.base2.service.configuration.migration;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+
+import 
org.perfsonar.base2.service.configuration.migration.ConfigFilesCollection;
+import org.perfsonar.base2.service.configuration.migration.TemplateEngine;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a 
href="mailto:">Blazej
 Pietrzak</a>
+ */
+public class TemplateEngineTest extends TestCase {
+
+       TemplateEngine engine;
+       
+       protected void setUp() throws Exception {
+               super.setUp();
+               engine = new TemplateEngine(new 
ConfigFilesCollection(getConfigPath()).loadProperties());
+       }
+
+       private String getConfigPath() {
+               return "src" + File.separator + "test" + File.separator + 
"java" + File.separator + 
TemplateEngine.class.getPackage().getName().replace(".", File.separator);
+       }
+       
+       public void testCreateFromTemplateWhereTemplateIsaDirectory() {
+               try {
+                       engine.createFileFromTemplate(new 
File(getConfigPath()), "configuration.xml");
+                       fail("IOException not thrown.");
+               } catch (IOException ex) { }
+       }
+       public void testCreateFromTemplateWhereTemplateDoesNotExist() throws 
IOException {
+               try {
+                       engine.createFileFromTemplate(new 
File(getConfigPath() + File.separator + "does_not_exist"), 
"configuration.xml");
+                       fail("FileNotFoundException not thrown.");
+               } catch (FileNotFoundException ex) { }
+       }
+       public void testCreateFromTemplateWhereFileIsaDirectory() {
+               try {
+                       engine.createFileFromTemplate(new 
File(getConfigPath() + File.separator + "configuration.xml.template"), 
getConfigPath());
+                       fail("IOException not thrown.");
+               } catch (IOException ex) { }
+       }
+       public void testCreateFromTemplate() throws IOException {
+               assertEquals(new File(getConfigPath() + File.separator + 
"expected.xml"), engine.createFileFromTemplate(new File(getConfigPath() + 
File.separator + "configuration.xml.template"), getConfigPath() + 
File.separator + "configuration.xml"));
+               assertTrue(new File(getConfigPath() + File.separator + 
"configuration.xml").delete());
+       }
+       
+       private void assertEquals(File expected, File actual) throws 
IOException {
+               assertEquals(toString(expected), toString(actual));
+       }
+
+       private String toString(File file) throws IOException {
+               final BufferedReader reader = new BufferedReader(new 
FileReader(file));
+               final StringBuffer result = new StringBuffer();
+               boolean first = true;
+               for (String line = reader.readLine(); line != null; line  = 
reader.readLine()) {
+                       if (first == false)
+                               result.append("\n");
+                       else
+                               first = false;
+                       result.append(line);
+               }
+               reader.close();
+               
+               return result.toString();
+       }
+       
+       protected void tearDown() throws Exception {
+               super.tearDown();
+       }
+
+}