db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1337543 - in /db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator: configuration/outlet/OtherTemplateLanguageTest.java control/ExistingTargetStrategyTest.java
Date Sat, 12 May 2012 13:48:45 GMT
Author: tfischer
Date: Sat May 12 13:48:45 2012
New Revision: 1337543

URL: http://svn.apache.org/viewvc?rev=1337543&view=rev
Log:
remove trailing spaces

Modified:
    db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OtherTemplateLanguageTest.java
    db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OtherTemplateLanguageTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OtherTemplateLanguageTest.java?rev=1337543&r1=1337542&r2=1337543&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OtherTemplateLanguageTest.java
(original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OtherTemplateLanguageTest.java
Sat May 12 13:48:45 2012
@@ -37,15 +37,15 @@ import org.junit.Test;
 
 /**
  * Tests that another template language can easily integrated.
- * 
+ *
  * @version $Id$
  */
 public class OtherTemplateLanguageTest
 {
-    private static final File TARGET_DIR 
+    private static final File TARGET_DIR
             = new File("target/test/otherTemplateLanguages");
 
-    private static final File OUTPUT_FILE 
+    private static final File OUTPUT_FILE
             = new File(TARGET_DIR, "output.txt");
 
     @Before

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java?rev=1337543&r1=1337542&r2=1337543&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
(original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
Sat May 12 13:48:45 2012
@@ -41,18 +41,18 @@ import org.junit.Test;
 
 public class ExistingTargetStrategyTest extends BaseTest
 {
-    private File confRootDir = new File("src/test/existingTargetStrategy");
-    private File targetDir1 = new File("target/test/existingTargetStrategy/target1");
-    private File targetDir2 = new File("target/test/existingTargetStrategy/target2");
-    private File workDir 
+    private final File confRootDir = new File("src/test/existingTargetStrategy");
+    private final File targetDir1 = new File("target/test/existingTargetStrategy/target1");
+    private final File targetDir2 = new File("target/test/existingTargetStrategy/target2");
+    private final File workDir
         = new File("target/test/existingTargetStrategy/work");
-    private File targetFile1 = new File(targetDir1, "output1.txt");
-    private File targetFile2 = new File(targetDir2, "output2.txt");
-    private File workFile1 = new File(workDir, "raw-generated/default/output1.txt");
-    private File workFile2 = new File(workDir, "raw-generated/other/outputDirKey2/output2.txt");
-    
-    private String srcPath1 = "src/main/torque-gen/src/source1.properties";
-    private String srcPath2 = "src/main/torque-gen/src/source2.properties";
+    private final File targetFile1 = new File(targetDir1, "output1.txt");
+    private final File targetFile2 = new File(targetDir2, "output2.txt");
+    private final File workFile1 = new File(workDir, "raw-generated/default/output1.txt");
+    private final File workFile2 = new File(workDir, "raw-generated/other/outputDirKey2/output2.txt");
+
+    private final String srcPath1 = "src/main/torque-gen/src/source1.properties";
+    private final String srcPath2 = "src/main/torque-gen/src/source2.properties";
 
     @Before
     public void setUp() throws IOException
@@ -79,7 +79,7 @@ public class ExistingTargetStrategyTest 
     public void testMergeStrategyChangeGenerationResult() throws Exception
     {
         File configurationDirectory = new File(confRootDir, "mergeStrategy");
-        File initialSourceDir 
+        File initialSourceDir
                 = new File(confRootDir, "/initial/src/main/torque-gen/src");
         runGeneration(configurationDirectory, initialSourceDir);
         File initialSourceDirectory = new File(confRootDir, "initial");
@@ -87,7 +87,7 @@ public class ExistingTargetStrategyTest 
         assertFile(new File(initialSourceDirectory, srcPath2), targetFile2);
         assertFile(new File(initialSourceDirectory, srcPath1), workFile1);
         assertFile(new File(initialSourceDirectory, srcPath2), workFile2);
-        
+
         // change the generation result but do not change the target file
         // -> new target must look like new generation result
         File mergeSourceDir  = new File(
@@ -104,7 +104,7 @@ public class ExistingTargetStrategyTest 
     public void testMergeStrategyChangeTarget() throws Exception
     {
         File configurationDirectory = new File(confRootDir, "mergeStrategy");
-        File initialSourceDir 
+        File initialSourceDir
                 = new File(confRootDir, "/initial/src/main/torque-gen/src");
         runGeneration(configurationDirectory, initialSourceDir);
         File initialSourceDirectory = new File(confRootDir, "initial");
@@ -112,7 +112,7 @@ public class ExistingTargetStrategyTest 
         assertFile(new File(initialSourceDirectory, srcPath2), targetFile2);
         assertFile(new File(initialSourceDirectory, srcPath1), workFile1);
         assertFile(new File(initialSourceDirectory, srcPath2), workFile2);
-        
+
         // change the target file result but do not change the generation result
         // -> new target must not change
         File mergeStrategyDir  = new File(
@@ -120,7 +120,7 @@ public class ExistingTargetStrategyTest 
                 "/mergeStrategy");
         String intermediateTargetContent1 = FileUtils.readFileToString(
                 new File(mergeStrategyDir, srcPath1),
-                "ISO-8859-1"); 
+                "ISO-8859-1");
         intermediateTargetContent1 = Pattern.compile("#.*\\r?\\n{1}?")
                 .matcher(intermediateTargetContent1)
                 .replaceAll("");
@@ -130,7 +130,7 @@ public class ExistingTargetStrategyTest 
                 "ISO-8859-1");
         String intermediateTargetContent2 = FileUtils.readFileToString(
                 new File(mergeStrategyDir, srcPath2),
-                "ISO-8859-1"); 
+                "ISO-8859-1");
         intermediateTargetContent2 = Pattern.compile("#.*\\r?\\n{1}?")
                 .matcher(intermediateTargetContent2)
                 .replaceAll("");
@@ -154,7 +154,7 @@ public class ExistingTargetStrategyTest 
             throws Exception
     {
         File configurationDirectory = new File(confRootDir, "mergeStrategy");
-        File initialSourceDir 
+        File initialSourceDir
                 = new File(confRootDir, "/initial/src/main/torque-gen/src");
         runGeneration(configurationDirectory, initialSourceDir);
         File initialSourceDirectory = new File(confRootDir, "initial");
@@ -162,14 +162,14 @@ public class ExistingTargetStrategyTest 
         assertFile(new File(initialSourceDirectory, srcPath2), targetFile2);
         assertFile(new File(initialSourceDirectory, srcPath1), workFile1);
         assertFile(new File(initialSourceDirectory, srcPath2), workFile2);
-        
+
         // change the target file result and the generation result
         File newTargetContentsFile1 = new File(
                 configurationDirectory,
                 "src/main/torque-gen/src/source1.properties");
         String newTargetContent1 = FileUtils.readFileToString(
                 newTargetContentsFile1,
-                "ISO-8859-1"); 
+                "ISO-8859-1");
         newTargetContent1 = Pattern.compile("#.*\\r?\\n{1}?")
                 .matcher(newTargetContent1)
                 .replaceAll("");
@@ -179,7 +179,7 @@ public class ExistingTargetStrategyTest 
                 "src/main/torque-gen/src/source2.properties");
         String newTargetContent2 = FileUtils.readFileToString(
                 newTargetContentsFile2,
-                "ISO-8859-1"); 
+                "ISO-8859-1");
         newTargetContent2 = Pattern.compile("#.*\\r?\\n{1}?")
                 .matcher(newTargetContent2)
                 .replaceAll("");
@@ -220,7 +220,7 @@ public class ExistingTargetStrategyTest 
         assertFile(
                 new File(configurationDirectoryInitial, srcPath2),
                 targetFile2);
-        File configurationDirectoryAppend 
+        File configurationDirectoryAppend
                 = new File(confRootDir, "appendStrategy");
         runGeneration(configurationDirectoryAppend, null);
         File expectedTargetFile1 = new File(targetDir1, "expectedOutput1.txt");



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message