diff --git hcatalog/build-support/ant/test.xml hcatalog/build-support/ant/test.xml index 97e70be..a9fc266 100644 --- hcatalog/build-support/ant/test.xml +++ hcatalog/build-support/ant/test.xml @@ -31,8 +31,10 @@ + + + diff --git hcatalog/build.properties hcatalog/build.properties index fe2de62..099d837 100644 --- hcatalog/build.properties +++ hcatalog/build.properties @@ -32,6 +32,7 @@ build.docs=${build.dir}/docs build.javadoc=${build.docs}/api dist.dir=${build.dir}/${final.name} +test.data.dir=${build.dir}/data test.dir=${build.dir}/test test.classes=${test.dir}/classes test.logs=${test.dir}/logs diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java hcatalog/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java index 4f23e0a..3ce03ea 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hcatalog/templeton/tool/TestTempletonUtils.java @@ -20,10 +20,14 @@ import org.junit.Assert; +import java.io.File; import java.io.FileNotFoundException; +import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.StringUtils; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class TestTempletonUtils { @@ -31,6 +35,27 @@ "2011-12-15 18:12:21,758 [main] INFO org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher - More information at: http://localhost:50030/jobdetails.jsp?jobid=job_201112140012_0047", "2011-12-15 18:12:46,907 [main] INFO org.apache.pig.tools.pigstats.SimplePigStats - Script Statistics: " }; + public static final String testDataDir = System.getProperty("test.data.dir"); + File tmpFile; + File usrFile; + + @Before + public void setup() { + try { + tmpFile = new File(testDataDir, "tmp"); + tmpFile.createNewFile(); + usrFile = new File(testDataDir, "usr"); + usrFile.createNewFile(); + } catch (IOException ex) { + Assert.fail(ex.getMessage()); + } + } + + @After + public void tearDown() { + tmpFile.delete(); + usrFile.delete(); + } @Test public void testIssetString() { @@ -100,10 +125,10 @@ public void testDecodeArray() { public void testHadoopFsPath() { try { TempletonUtils.hadoopFsPath(null, null, null); - TempletonUtils.hadoopFsPath("/tmp", null, null); - TempletonUtils.hadoopFsPath("/tmp", new Configuration(), null); + TempletonUtils.hadoopFsPath(tmpFile.toURI().toString(), null, null); + TempletonUtils.hadoopFsPath(tmpFile.toURI().toString(), new Configuration(), null); } catch (FileNotFoundException e) { - Assert.fail("Couldn't find /tmp"); + Assert.fail("Couldn't find " + tmpFile.toURI().toString()); } catch (Exception e) { // This is our problem -- it means the configuration was wrong. e.printStackTrace(); @@ -124,13 +149,15 @@ public void testHadoopFsPath() { public void testHadoopFsFilename() { try { Assert.assertEquals(null, TempletonUtils.hadoopFsFilename(null, null, null)); - Assert.assertEquals(null, TempletonUtils.hadoopFsFilename("/tmp", null, null)); - Assert.assertEquals("file:/tmp", - TempletonUtils.hadoopFsFilename("/tmp", - new Configuration(), - null)); + Assert.assertEquals(null, + TempletonUtils.hadoopFsFilename(tmpFile.toURI().toString(), null, null)); + Assert.assertEquals(tmpFile.toURI().toString(), + TempletonUtils.hadoopFsFilename(tmpFile.toURI().toString(), + new Configuration(), + null)); } catch (FileNotFoundException e) { Assert.fail("Couldn't find name for /tmp"); + Assert.fail("Couldn't find name for " + tmpFile.toURI().toString()); } catch (Exception e) { // Something else is wrong e.printStackTrace(); @@ -151,15 +178,15 @@ public void testHadoopFsFilename() { public void testHadoopFsListAsArray() { try { Assert.assertTrue(TempletonUtils.hadoopFsListAsArray(null, null, null) == null); - Assert.assertTrue(TempletonUtils.hadoopFsListAsArray("/tmp, /usr", - null, null) == null); - String[] tmp2 - = TempletonUtils.hadoopFsListAsArray("/tmp,/usr", - new Configuration(), null); - Assert.assertEquals("file:/tmp", tmp2[0]); - Assert.assertEquals("file:/usr", tmp2[1]); + Assert.assertTrue(TempletonUtils.hadoopFsListAsArray( + tmpFile.toURI().toString() + "," + usrFile.toString(), null, null) == null); + String[] tmp2 = TempletonUtils.hadoopFsListAsArray( + tmpFile.toURI().toString() + "," + usrFile.toURI().toString(), + new Configuration(), null); + Assert.assertEquals(tmpFile.toURI().toString(), tmp2[0]); + Assert.assertEquals(usrFile.toURI().toString(), tmp2[1]); } catch (FileNotFoundException e) { - Assert.fail("Couldn't find name for /tmp"); + Assert.fail("Couldn't find name for " + tmpFile.toURI().toString()); } catch (Exception e) { // Something else is wrong e.printStackTrace(); @@ -181,12 +208,16 @@ public void testHadoopFsListAsArray() { public void testHadoopFsListAsString() { try { Assert.assertTrue(TempletonUtils.hadoopFsListAsString(null, null, null) == null); - Assert.assertTrue(TempletonUtils.hadoopFsListAsString("/tmp,/usr", - null, null) == null); - Assert.assertEquals("file:/tmp,file:/usr", TempletonUtils.hadoopFsListAsString - ("/tmp,/usr", new Configuration(), null)); + Assert.assertTrue(TempletonUtils.hadoopFsListAsString( + tmpFile.toURI().toString() + "," + usrFile.toURI().toString(), + null, null) == null); + Assert.assertEquals( + tmpFile.toURI().toString() + "," + usrFile.toURI().toString(), + TempletonUtils.hadoopFsListAsString( + tmpFile.toURI().toString() + "," + usrFile.toURI().toString(), + new Configuration(), null)); } catch (FileNotFoundException e) { - Assert.fail("Couldn't find name for /tmp"); + Assert.fail("Couldn't find name for " + tmpFile.toURI().toString()); } catch (Exception e) { // Something else is wrong e.printStackTrace();