You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2012/11/07 06:58:06 UTC

svn commit: r1406469 [7/10] - in /pig/trunk: ./ test/org/apache/pig/test/

Modified: pig/trunk/test/org/apache/pig/test/TestParamSubPreproc.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestParamSubPreproc.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestParamSubPreproc.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestParamSubPreproc.java Wed Nov  7 05:58:04 2012
@@ -18,87 +18,70 @@
 
 package org.apache.pig.test;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
-import org.apache.pig.tools.parameters.*;
-
-import junit.framework.TestCase;
-
-public class TestParamSubPreproc extends TestCase {
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pig.tools.parameters.ParameterSubstitutionPreprocessor;
+import org.apache.pig.tools.parameters.ParseException;
+import org.junit.Test;
 
+public class TestParamSubPreproc {
     private final Log log = LogFactory.getLog(getClass());
 
     private BufferedReader pigIStream;
     private FileWriter pigOStream;
     private FileInputStream pigExResultStream;
-    private String basedir;
-
+    private String basedir = "test/org/apache/pig/test/data";
 
-    public TestParamSubPreproc(String name) {
-        super(name);
-        basedir = "test/org/apache/pig/test/data";
-    }
-
-    /* Test case 1   
+    /* Test case 1
      * Use a parameter within a pig script and provide value on the command line.
      */
     @Test
     public void testCmdlineParam() throws Exception{
         log.info("Starting test testCmdlineParam() ...");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date=20080228"};
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = {"date=20080228"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
+
         log.info("Done");
 
     }
@@ -109,46 +92,38 @@ public class TestParamSubPreproc extends
     @Test
     public void testFileParam() throws Exception{
         log.info ("Starting test  testFileParam()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = {basedir+"/ConfFile1.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution from config file failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution from config file failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = {basedir+"/ConfFile1.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution from config file failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution from config file failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
+
         log.info("Done");
     }
 
@@ -158,50 +133,42 @@ public class TestParamSubPreproc extends
      @Test
      public void testShellCommand() throws Exception{
         log.info("Starting test testShellCommand()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input4.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null; //{"date=`sh generate_date.sh`"};     //`date \\T`"};
-            String[] argFiles = null; // {basedir+"/ConfFile1.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResultDefault.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input4.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = null; //{"date=`sh generate_date.sh`"};     //`date \\T`"};
+        String[] argFiles = null; // {basedir+"/ConfFile1.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResultDefault.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
+
         log.info("Done");
     }
 
-    /* Test case 4   
+    /* Test case 4
      * Use a Pig-supported parameter like "$0" and ensure that the Pig-supported parameter is not resolved
      */
     @Test
@@ -223,7 +190,7 @@ public class TestParamSubPreproc extends
         log.info("Done");
     }
 
-    /* Test case 5   
+    /* Test case 5
      * Use the %declare statement after the command has been used.
      */
     @Test
@@ -244,102 +211,86 @@ public class TestParamSubPreproc extends
         log.info("Done");
     }
 
-    /* Test case 7   
+    /* Test case 7
      *  Use a parameter in %declare that is defined in terms of other parameters
      */
     @Test
     public void testSubstitutionWithinValue() throws Exception{
         log.info("Starting test  testSubstitutionWithinValue()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputSubstitutionWithinValue.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = {basedir+"/ConfFile1.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputSubstitutionWithinValue.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution within a value failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution within a value failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = {basedir+"/ConfFile1.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution within a value failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution within a value failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
+
         log.info("Done");
     }
 
 
     /* Test case 8
-     *  Use a parameter within a pig script, provide value for it through running a binary or script. 
+     *  Use a parameter within a pig script, provide value for it through running a binary or script.
      *  The script itself takes an argument that is a parameter and should be resolved
      */
-    @Test 
+    @Test
     public void testSubstitutionWithinShellCommand() throws Exception{
         log.info("Starting test testSubstitutionWithinShellCommand()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputSubstitutionWithinShellCommand.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null; 
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputSubstitutionWithinShellCommand.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
+
+        inExpected.close();
+        inResult.close();
         log.info("Done");
     }
 
@@ -350,48 +301,40 @@ public class TestParamSubPreproc extends
     @Test
     public void testCmdlineParamPriortoDeclare() throws Exception{
         log.info("Starting test testCmdlineParamPriortoDeclare()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input2.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"param='20080228'"}; 
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input2.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResultCmdLnPriorDeclare.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution of command line arg. prior to declare stmt failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution of command line arg. prior to declare stmt failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = {"param='20080228'"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResultCmdLnPriorDeclare.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution of command line arg. prior to declare stmt failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution of command line arg. prior to declare stmt failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
+
         log.info("Done");
-    } 
+    }
 
 
     /* Test case 10
@@ -400,95 +343,79 @@ public class TestParamSubPreproc extends
     @Test
     public void testCmdnameAsParamDeclare() throws Exception{
         log.info("Starting test testCmdnameAsParamDeclare()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputCmdnameAsParamDeclare.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null; 
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputCmdnameAsParamDeclare.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution for a command with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution for a command with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult4.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution for a command with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution for a command with shell command failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
+
+        inExpected.close();
+        inResult.close();
         log.info("Done");
     }
 
 
-    /* Test case 11   
+    /* Test case 11
      * Use the same parameter multiple times on the command line.
      * Result : last value used and warning should be thrown
      */
     @Test
     public void testMultipleCmdlineParam() throws Exception{
         log.info("Starting test testCmdnameAsParamDeclare()");
-        try {     
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='092487'","date='20080228'"};
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = {"date='092487'","date='20080228'"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
+
+        inExpected.close();
+        inResult.close();
         log.info("Done");
     }
 
@@ -498,48 +425,40 @@ public class TestParamSubPreproc extends
     @Test
     public void testFileParamsFromMultipleFiles() throws Exception{
         log.info("Starting test testFileParamsFromMultipleFiles()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = {basedir+"/ConfFile1.txt" , basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = {basedir+"/ConfFile1.txt" , basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
+
+        inExpected.close();
+        inResult.close();
         log.info("Done");
     }
-    
+
     /* Test case 13
      * Use the same parameter in multiple files.
      * Result: last value used and warning should be thrown
@@ -547,45 +466,37 @@ public class TestParamSubPreproc extends
     @Test
     public void testSameParamInMultipleFiles() throws Exception{
         log.info("Starting test testSameParamInMultipleFiles()");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = {basedir+"/ConfFile3.txt" , basedir+"/ConfFile2.txt", basedir+"/ConfFile1.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Same Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Same Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = {basedir+"/ConfFile3.txt" , basedir+"/ConfFile2.txt", basedir+"/ConfFile1.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Same Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Same Parameter substitution from multiple config files failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
+
+        inExpected.close();
+        inResult.close();
         log.info("Done");
     }
 
@@ -595,49 +506,40 @@ public class TestParamSubPreproc extends
      */
     @Test
     public void testMultipleParamsFromSingleFile() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            String[] arg = null;
-            String[] argFiles = {basedir+"/ConfFileSameParamMultipleTimes.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        String[] arg = null;
+        String[] argFiles = {basedir+"/ConfFileSameParamMultipleTimes.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
-    /* Test case 15,16   
+
+    /* Test case 15,16
      *   Use an empty lines and Comment lines in the parameter file.
      *  Result: Allowed
      */
@@ -649,18 +551,10 @@ public class TestParamSubPreproc extends
 
         String[] arg = null;
         String[] argFiles = {basedir+"/ConfFileWithEmptyComments.txt"};
-        try {
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
-        }
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
     }
-    
-    /* Test case 17   
+
+    /* Test case 17
      *   Use a line in the file that is not empty or a comment but does not conform to param_name=param_value.
      */
     @Test
@@ -676,14 +570,10 @@ public class TestParamSubPreproc extends
             fail ("Should have thrown an exception");
         } catch (ParseException e) {
             assertTrue(e.getMessage().startsWith("Encountered \" <IDENTIFIER> \"is \"\" at line 2, column 6."));
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
         }
     }
-    
-    
+
+
     /* Test case 18,19
      *   Check a parameter line of form param_name=param_value is allowed.
      *   Check a parameter line of form param_name<white space>=<white space>param_value is allowed.
@@ -696,62 +586,45 @@ public class TestParamSubPreproc extends
 
         String[] arg = null;
         String[] argFiles = {basedir+"/ConfFileWithValidLines.txt"};
-        try {
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
-        }
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
     }
-    
+
      /* Test case 20
      * Use a combination of command line and file parameters.
      */
     @Test
     public void testCmdlineFileCombo() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = {basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = {basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
 
     /* Test case 21
@@ -760,639 +633,518 @@ public class TestParamSubPreproc extends
      */
     @Test
     public void testCmdlineFileComboDuplicate() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = {basedir+"/ConfFileDuplicates.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = {basedir+"/ConfFileDuplicates.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
+
 
     /* Test case 22
      *  Use a combination of command line, file and declare.
      */
     @Test
     public void testCmdlineFileDeclareCombo() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = {basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = {basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
+
     /* Test case 23
      *  Use a combination of command line, file and declare where there are duplicate parameters.
      *  Result: Declare has highest priority.
      */
     @Test
     public void testCmdlineFileDeclareComboDuplicates() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'" , "tableName=\"skip this\""};
-            String[] argFiles = {basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = {"date='20080228'" , "tableName=\"skip this\""};
+        String[] argFiles = {basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
+
     /* Test case 24
      *   Use multiple declare statement that specify the same parameter.
      *   Result: Scope of a parameter declared using declare is until the next declare statement that defines the same parameter.
      */
     @Test
     public void testMultipleDeclareScope() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleDeclares.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputMultipleDeclares.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResultMulDecs.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResultMulDecs.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
-    
+
     /* Test case 25
      *   Use %default to define param values
      */
     @Test
     public void testDefaultParam() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputDefault.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputDefault.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
 
     /* Test case 26
      *  Use a combination of file, command line, declare and default. Default has the lowest precedence.
      */
     @Test
     public void testCmdlineFileDeclareDefaultComboDuplicates() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date='20080228'" , "tableName=\"skip this\""};
-            String[] argFiles = {basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
-
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String[] arg = {"date='20080228'" , "tableName=\"skip this\""};
+        String[] argFiles = {basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-    
-    
+
+
     /* Test case 28
      *  28. More than 1 parameter is present and needs to be substituted within a line e.g. A = load '/data/$name/$date';
      */
     @Test
     public void testMultipleParamsinSingleLine() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputThreeParams.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = {basedir+"/ConfFile2.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = {basedir+"/ConfFile2.txt"};
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
 
-
-    /* Test case 29   
+    /* Test case 29
      * Parameter is substituted within a literal e.g. store A into 'output/$name';
      */
     @Test
     public void testSubstituteWithinLiteral() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
 
-    
-    /* Test case 30   
+    /* Test case 30
      * Make sure that escaped values are not substituted e.g. A = load '/data/\$name'
      */
     @Test
     public void testEscaping() throws Exception{
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputEscape.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputEscape.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            String[] arg = {"date='20080228'"};
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        String[] arg = {"date='20080228'"};
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult2.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult2.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
     }
-        
-    /* Test case 31   
+
+    /* Test case 31
      * Use of inline command
      */
     @Test
     public void testCmdlineParamWithInlineCmd() throws Exception{
         log.info("Starting test testCmdlineParamWithInlineCmd() ...");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"date=`perl -e 'print \"20080228\n20070101\"' | head -n 1`"};
-            if (Util.WINDOWS)
-                arg[0] = "date=`perl -e 'print \\\"20080228\n20070101\\\"' | head -n 1`";
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/input1.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = {"date=`perl -e 'print \"20080228\n20070101\"' | head -n 1`"};
+        if (Util.WINDOWS)
+            arg[0] = "date=`perl -e 'print \\\"20080228\n20070101\\\"' | head -n 1`";
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/ExpectedResult.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
-        log.info("Done");
+        inExpected.close();
+        inResult.close();
 
+        log.info("Done");
     }
 
-    /* Test case 32   
+    /* Test case 32
      * No substitution
      */
     @Test
     public void testNoVars() throws Exception{
         log.info("Starting test testNoVars() ...");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/inputNoVars.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = null;
-            String[] argFiles = null;
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
+        ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
+        pigIStream = new BufferedReader(new FileReader(basedir + "/inputNoVars.pig"));
+        pigOStream = new FileWriter(basedir + "/output1.pig");
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/inputNoVars.pig");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
-            BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
-
-            String exLine;
-            String resLine;
-            int lineNum=0;
-
-            while (true) {
-                lineNum++;
-                exLine = inExpected.readLine();
-                resLine = inResult.readLine();
-                if (exLine==null || resLine==null)
-                    break;
-                assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
-            }
-            if (!(exLine==null && resLine==null)) {
-                fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
-            }
+        String[] arg = null;
+        String[] argFiles = null;
+        ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            inExpected.close();
-            inResult.close();
-        } catch (ParseException e) {
-            fail ("Got ParseException : " + e.getMessage());
-        } catch (RuntimeException e) {
-            fail ("Got RuntimeException : " + e.getMessage());
-        } catch (Error e) {
-            fail ("Got error : " + e.getMessage());
+        FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
+        pigExResultStream = new FileInputStream(basedir + "/inputNoVars.pig");
+        BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));
+        BufferedReader inResult = new BufferedReader(new InputStreamReader(pigResultStream));
+
+        String exLine;
+        String resLine;
+        int lineNum=0;
+
+        while (true) {
+            lineNum++;
+            exLine = inExpected.readLine();
+            resLine = inResult.readLine();
+            if (exLine==null || resLine==null)
+                break;
+            assertEquals("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum ,exLine.trim(), resLine.trim());
+        }
+        if (!(exLine==null && resLine==null)) {
+            fail ("Command line parameter substitution failed. " + "Expected : "+exLine+" , but got : "+resLine+" in line num : "+lineNum);
         }
 
+        inExpected.close();
+        inResult.close();
         log.info("Done");
-
     }
 
-    /* Test case 32   
+    /* Test case 32
      * Test special values in characters
      */
     @Test
     public void testComplexVals() throws Exception{
         log.info("Starting test testComplexVals() ...");
-        try {
-            ParameterSubstitutionPreprocessor ps = new ParameterSubstitutionPreprocessor(50);
-            pigIStream = new BufferedReader(new FileReader(basedir + "/input5.pig"));
-            pigOStream = new FileWriter(basedir + "/output1.pig");
-
-            String[] arg = {"loadfile = /user/pig/tests/data/singlefile/textdoc.txt"};
-            String[] argFiles = {basedir+"/ConfFileComplexVal.txt"};
-            ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
 
-            FileInputStream pigResultStream = new FileInputStream(basedir + "/output1.pig");
-            pigExResultStream = new FileInputStream(basedir + "/ExpectedResult3.txt");
-            BufferedReader inExpected = new BufferedReader(new InputStreamReader(pigExResultStream));

[... 418 lines stripped ...]