http://git-wip-us.apache.org/repos/asf/hbase-site/blob/07e68d46/testapidocs/src-html/org/apache/hadoop/hbase/HBaseCommonTestingUtility.html
----------------------------------------------------------------------
diff --git
a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseCommonTestingUtility.html
b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseCommonTestingUtility.html
index 080b53e..909227c 100644
---
a/testapidocs/src-html/org/apache/hadoop/hbase/HBaseCommonTestingUtility.html
+++
b/testapidocs/src-html/org/apache/hadoop/hbase/HBaseCommonTestingUtility.html
@@ -28,188 +28,210 @@
<span class="sourceLineNo">020</span><a name="line.20"></a>
<span class="sourceLineNo">021</span>import java.io.File;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.io.IOException;<a
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.UUID;<a
name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.commons.io.FileUtils;<a
name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.commons.logging.Log;<a
name="line.26"></a>
-<span class="sourceLineNo">027</span>import
org.apache.commons.logging.LogFactory;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import
org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.Path;<a
name="line.29"></a>
-<span class="sourceLineNo">030</span>import
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Common helpers for testing HBase that
do not depend on specific server/etc. things.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * {@see
org.apache.hadoop.hbase.HBaseTestingUtility}<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>@InterfaceAudience.Public<a
name="line.36"></a>
-<span class="sourceLineNo">037</span>public class HBaseCommonTestingUtility
{<a name="line.37"></a>
-<span class="sourceLineNo">038</span> protected static final Log LOG =
LogFactory.getLog(HBaseCommonTestingUtility.class);<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> protected Configuration conf;<a
name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span> public HBaseCommonTestingUtility() {<a
name="line.42"></a>
-<span class="sourceLineNo">043</span> this(HBaseConfiguration.create());<a
name="line.43"></a>
-<span class="sourceLineNo">044</span> }<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> public
HBaseCommonTestingUtility(Configuration conf) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.conf = conf;<a
name="line.47"></a>
-<span class="sourceLineNo">048</span> }<a name="line.48"></a>
+<span class="sourceLineNo">023</span>import java.util.Arrays;<a
name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.List;<a
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.UUID;<a
name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.commons.io.FileUtils;<a
name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a
name="line.28"></a>
+<span class="sourceLineNo">029</span>import
org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import
org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.fs.Path;<a
name="line.31"></a>
+<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.io.compress.Compression;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Common helpers for testing HBase that
do not depend on specific server/etc. things.<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * {@see
org.apache.hadoop.hbase.HBaseTestingUtility}<a name="line.37"></a>
+<span class="sourceLineNo">038</span> */<a name="line.38"></a>
+<span class="sourceLineNo">039</span>@InterfaceAudience.Public<a
name="line.39"></a>
+<span class="sourceLineNo">040</span>public class HBaseCommonTestingUtility
{<a name="line.40"></a>
+<span class="sourceLineNo">041</span> protected static final Log LOG =
LogFactory.getLog(HBaseCommonTestingUtility.class);<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> /** Compression algorithms to use in
parameterized JUnit 4 tests */<a name="line.43"></a>
+<span class="sourceLineNo">044</span> public static final
List<Object[]> COMPRESSION_ALGORITHMS_PARAMETERIZED =<a
name="line.44"></a>
+<span class="sourceLineNo">045</span> Arrays.asList(new Object[][] {<a
name="line.45"></a>
+<span class="sourceLineNo">046</span> { Compression.Algorithm.NONE },<a
name="line.46"></a>
+<span class="sourceLineNo">047</span> { Compression.Algorithm.GZ }<a
name="line.47"></a>
+<span class="sourceLineNo">048</span> });<a name="line.48"></a>
<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> /**<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Returns this classes's instance of
{@link Configuration}.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> *<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * @return Instance of Configuration.<a
name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public Configuration getConfiguration()
{<a name="line.55"></a>
-<span class="sourceLineNo">056</span> return this.conf;<a
name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * System property key to get base test
directory value<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public static final String
BASE_TEST_DIRECTORY_KEY =<a name="line.62"></a>
-<span class="sourceLineNo">063</span> "test.build.data.basedirectory";<a
name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> /**<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * Default base directory for test
output.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> */<a name="line.67"></a>
-<span class="sourceLineNo">068</span> public static final String
DEFAULT_BASE_TEST_DIRECTORY = "target/test-data";<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * Directory where we put the data for
this instance of HBaseTestingUtility<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private File dataTestDir = null;<a
name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * @return Where to write test data on
local filesystem, specific to<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * the test. Useful for tests that do
not use a cluster.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Creates it if it does not exist
already.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public Path getDataTestDir() {<a
name="line.80"></a>
-<span class="sourceLineNo">081</span> if (this.dataTestDir == null) {<a
name="line.81"></a>
-<span class="sourceLineNo">082</span> setupDataTestDir();<a
name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return new
Path(this.dataTestDir.getAbsolutePath());<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">050</span> /** This is for unit tests
parameterized with a two booleans. */<a name="line.50"></a>
+<span class="sourceLineNo">051</span> public static final
List<Object[]> BOOLEAN_PARAMETERIZED =<a name="line.51"></a>
+<span class="sourceLineNo">052</span> Arrays.asList(new Object[][] {<a
name="line.52"></a>
+<span class="sourceLineNo">053</span> {false},<a name="line.53"></a>
+<span class="sourceLineNo">054</span> {true}<a name="line.54"></a>
+<span class="sourceLineNo">055</span> });<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> /** Compression algorithms to use in
testing */<a name="line.57"></a>
+<span class="sourceLineNo">058</span> public static final
Compression.Algorithm[] COMPRESSION_ALGORITHMS = {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> Compression.Algorithm.NONE,
Compression.Algorithm.GZ<a name="line.59"></a>
+<span class="sourceLineNo">060</span> };<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> protected Configuration conf;<a
name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> public HBaseCommonTestingUtility() {<a
name="line.64"></a>
+<span class="sourceLineNo">065</span> this(HBaseConfiguration.create());<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> public
HBaseCommonTestingUtility(Configuration conf) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> this.conf = conf;<a
name="line.69"></a>
+<span class="sourceLineNo">070</span> }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> /**<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * Returns this classes's instance of
{@link Configuration}.<a name="line.73"></a>
+<span class="sourceLineNo">074</span> *<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * @return Instance of Configuration.<a
name="line.75"></a>
+<span class="sourceLineNo">076</span> */<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public Configuration getConfiguration()
{<a name="line.77"></a>
+<span class="sourceLineNo">078</span> return this.conf;<a
name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * System property key to get base test
directory value<a name="line.82"></a>
+<span class="sourceLineNo">083</span> */<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public static final String
BASE_TEST_DIRECTORY_KEY =<a name="line.84"></a>
+<span class="sourceLineNo">085</span> "test.build.data.basedirectory";<a
name="line.85"></a>
<span class="sourceLineNo">086</span><a name="line.86"></a>
<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * @param subdirName<a
name="line.88"></a>
-<span class="sourceLineNo">089</span> * @return Path to a subdirectory named
<code>subdirName</code> under<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * {@link #getDataTestDir()}.<a
name="line.90"></a>
-<span class="sourceLineNo">091</span> * Does *NOT* create it if it does not
exist.<a name="line.91"></a>
-<span class="sourceLineNo">092</span> */<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public Path getDataTestDir(final String
subdirName) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return new Path(getDataTestDir(),
subdirName);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
+<span class="sourceLineNo">088</span> * Default base directory for test
output.<a name="line.88"></a>
+<span class="sourceLineNo">089</span> */<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public static final String
DEFAULT_BASE_TEST_DIRECTORY = "target/test-data";<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * Directory where we put the data for
this instance of HBaseTestingUtility<a name="line.93"></a>
+<span class="sourceLineNo">094</span> */<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private File dataTestDir = null;<a
name="line.95"></a>
<span class="sourceLineNo">096</span><a name="line.96"></a>
<span class="sourceLineNo">097</span> /**<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * Sets up a directory for a test to
use.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> *<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @return New directory path, if
created.<a name="line.100"></a>
+<span class="sourceLineNo">098</span> * @return Where to write test data on
local filesystem, specific to<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * the test. Useful for tests that do
not use a cluster.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> * Creates it if it does not exist
already.<a name="line.100"></a>
<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span> protected Path setupDataTestDir() {<a
name="line.102"></a>
-<span class="sourceLineNo">103</span> if (this.dataTestDir != null) {<a
name="line.103"></a>
-<span class="sourceLineNo">104</span> LOG.warn("Data test dir already
setup in " +<a name="line.104"></a>
-<span class="sourceLineNo">105</span>
dataTestDir.getAbsolutePath());<a name="line.105"></a>
-<span class="sourceLineNo">106</span> return null;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span> Path testPath = getRandomDir();<a
name="line.108"></a>
-<span class="sourceLineNo">109</span> this.dataTestDir = new
File(testPath.toString()).getAbsoluteFile();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // Set this property so if mapreduce
jobs run, they will use this as their home dir.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> System.setProperty("test.build.dir",
this.dataTestDir.toString());<a name="line.111"></a>
-<span class="sourceLineNo">112</span> if (deleteOnExit())
this.dataTestDir.deleteOnExit();<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> createSubDir("hbase.local.dir",
testPath, "hbase-local-dir");<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span> return testPath;<a
name="line.116"></a>
+<span class="sourceLineNo">102</span> public Path getDataTestDir() {<a
name="line.102"></a>
+<span class="sourceLineNo">103</span> if (this.dataTestDir == null) {<a
name="line.103"></a>
+<span class="sourceLineNo">104</span> setupDataTestDir();<a
name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return new
Path(this.dataTestDir.getAbsolutePath());<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @param subdirName<a
name="line.110"></a>
+<span class="sourceLineNo">111</span> * @return Path to a subdirectory named
<code>subdirName</code> under<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * {@link #getDataTestDir()}.<a
name="line.112"></a>
+<span class="sourceLineNo">113</span> * Does *NOT* create it if it does not
exist.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> */<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public Path getDataTestDir(final String
subdirName) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> return new Path(getDataTestDir(),
subdirName);<a name="line.116"></a>
<span class="sourceLineNo">117</span> }<a name="line.117"></a>
<span class="sourceLineNo">118</span><a name="line.118"></a>
<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @return A dir with a random (uuid)
name under the test dir<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @see #getBaseTestDir()<a
name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public Path getRandomDir() {<a
name="line.123"></a>
-<span class="sourceLineNo">124</span> return new Path(getBaseTestDir(),
UUID.randomUUID().toString());<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> protected void createSubDir(String
propertyName, Path parent, String subDirName) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> Path newPath = new Path(parent,
subDirName);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> File newDir = new
File(newPath.toString()).getAbsoluteFile();<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (deleteOnExit())
newDir.deleteOnExit();<a name="line.130"></a>
-<span class="sourceLineNo">131</span> conf.set(propertyName,
newDir.getAbsolutePath());<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> /**<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * @return True if we should delete
testing dirs on exit.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> boolean deleteOnExit() {<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> String v =
System.getProperty("hbase.testing.preserve.testdir");<a name="line.138"></a>
-<span class="sourceLineNo">139</span> // Let default be true, to delete on
exit.<a name="line.139"></a>
-<span class="sourceLineNo">140</span> return v == null ? true :
!Boolean.parseBoolean(v);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @return True if we removed the test
dirs<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @throws IOException<a
name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public boolean cleanupTestDir() throws
IOException {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> if (deleteDir(this.dataTestDir)) {<a
name="line.148"></a>
-<span class="sourceLineNo">149</span> this.dataTestDir = null;<a
name="line.149"></a>
-<span class="sourceLineNo">150</span> return true;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return false;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span> * @param subdir Test subdir name.<a
name="line.156"></a>
-<span class="sourceLineNo">157</span> * @return True if we removed the test
dir<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @throws IOException<a
name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> boolean cleanupTestDir(final String
subdir) throws IOException {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> if (this.dataTestDir == null) {<a
name="line.161"></a>
-<span class="sourceLineNo">162</span> return false;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return deleteDir(new
File(this.dataTestDir, subdir));<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * @return Where to write test data on
local filesystem; usually<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * {@link
#DEFAULT_BASE_TEST_DIRECTORY}<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * Should not be used by the unit
tests, hence its's private.<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * Unit test will use a subdirectory of
this directory.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> * @see #setupDataTestDir()<a
name="line.172"></a>
-<span class="sourceLineNo">173</span> */<a name="line.173"></a>
-<span class="sourceLineNo">174</span> private Path getBaseTestDir() {<a
name="line.174"></a>
-<span class="sourceLineNo">175</span> String PathName =
System.getProperty(<a name="line.175"></a>
-<span class="sourceLineNo">176</span> BASE_TEST_DIRECTORY_KEY,
DEFAULT_BASE_TEST_DIRECTORY);<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> return new Path(PathName);<a
name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span> /**<a name="line.181"></a>
-<span class="sourceLineNo">182</span> * @param dir Directory to delete<a
name="line.182"></a>
-<span class="sourceLineNo">183</span> * @return True if we deleted it.<a
name="line.183"></a>
-<span class="sourceLineNo">184</span> * @throws IOException<a
name="line.184"></a>
-<span class="sourceLineNo">185</span> */<a name="line.185"></a>
-<span class="sourceLineNo">186</span> boolean deleteDir(final File dir)
throws IOException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> if (dir == null || !dir.exists()) {<a
name="line.187"></a>
-<span class="sourceLineNo">188</span> return true;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> int ntries = 0;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> do {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> ntries += 1;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> try {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> if (deleteOnExit())
FileUtils.deleteDirectory(dir);<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return true;<a
name="line.195"></a>
-<span class="sourceLineNo">196</span> } catch (IOException ex) {<a
name="line.196"></a>
-<span class="sourceLineNo">197</span> LOG.warn("Failed to delete " +
dir.getAbsolutePath());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> } catch (IllegalArgumentException
ex) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> LOG.warn("Failed to delete " +
dir.getAbsolutePath(), ex);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> }<a name="line.200"></a>
-<span class="sourceLineNo">201</span> } while (ntries < 30);<a
name="line.201"></a>
-<span class="sourceLineNo">202</span> return ntries < 30;<a
name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>}<a name="line.204"></a>
+<span class="sourceLineNo">120</span> * Sets up a directory for a test to
use.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> *<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @return New directory path, if
created.<a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> protected Path setupDataTestDir() {<a
name="line.124"></a>
+<span class="sourceLineNo">125</span> if (this.dataTestDir != null) {<a
name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.warn("Data test dir already
setup in " +<a name="line.126"></a>
+<span class="sourceLineNo">127</span>
dataTestDir.getAbsolutePath());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> return null;<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Path testPath = getRandomDir();<a
name="line.130"></a>
+<span class="sourceLineNo">131</span> this.dataTestDir = new
File(testPath.toString()).getAbsoluteFile();<a name="line.131"></a>
+<span class="sourceLineNo">132</span> // Set this property so if mapreduce
jobs run, they will use this as their home dir.<a name="line.132"></a>
+<span class="sourceLineNo">133</span> System.setProperty("test.build.dir",
this.dataTestDir.toString());<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (deleteOnExit())
this.dataTestDir.deleteOnExit();<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span> createSubDir("hbase.local.dir",
testPath, "hbase-local-dir");<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> return testPath;<a
name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * @return A dir with a random (uuid)
name under the test dir<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * @see #getBaseTestDir()<a
name="line.143"></a>
+<span class="sourceLineNo">144</span> */<a name="line.144"></a>
+<span class="sourceLineNo">145</span> public Path getRandomDir() {<a
name="line.145"></a>
+<span class="sourceLineNo">146</span> return new Path(getBaseTestDir(),
UUID.randomUUID().toString());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> protected void createSubDir(String
propertyName, Path parent, String subDirName) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> Path newPath = new Path(parent,
subDirName);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> File newDir = new
File(newPath.toString()).getAbsoluteFile();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> if (deleteOnExit())
newDir.deleteOnExit();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> conf.set(propertyName,
newDir.getAbsolutePath());<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
+<span class="sourceLineNo">157</span> * @return True if we should delete
testing dirs on exit.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> */<a name="line.158"></a>
+<span class="sourceLineNo">159</span> boolean deleteOnExit() {<a
name="line.159"></a>
+<span class="sourceLineNo">160</span> String v =
System.getProperty("hbase.testing.preserve.testdir");<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // Let default be true, to delete on
exit.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return v == null ? true :
!Boolean.parseBoolean(v);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @return True if we removed the test
dirs<a name="line.166"></a>
+<span class="sourceLineNo">167</span> * @throws IOException<a
name="line.167"></a>
+<span class="sourceLineNo">168</span> */<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public boolean cleanupTestDir() throws
IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> if (deleteDir(this.dataTestDir)) {<a
name="line.170"></a>
+<span class="sourceLineNo">171</span> this.dataTestDir = null;<a
name="line.171"></a>
+<span class="sourceLineNo">172</span> return true;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> return false;<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * @param subdir Test subdir name.<a
name="line.178"></a>
+<span class="sourceLineNo">179</span> * @return True if we removed the test
dir<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * @throws IOException<a
name="line.180"></a>
+<span class="sourceLineNo">181</span> */<a name="line.181"></a>
+<span class="sourceLineNo">182</span> boolean cleanupTestDir(final String
subdir) throws IOException {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> if (this.dataTestDir == null) {<a
name="line.183"></a>
+<span class="sourceLineNo">184</span> return false;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return deleteDir(new
File(this.dataTestDir, subdir));<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * @return Where to write test data on
local filesystem; usually<a name="line.190"></a>
+<span class="sourceLineNo">191</span> * {@link
#DEFAULT_BASE_TEST_DIRECTORY}<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * Should not be used by the unit
tests, hence its's private.<a name="line.192"></a>
+<span class="sourceLineNo">193</span> * Unit test will use a subdirectory of
this directory.<a name="line.193"></a>
+<span class="sourceLineNo">194</span> * @see #setupDataTestDir()<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> */<a name="line.195"></a>
+<span class="sourceLineNo">196</span> private Path getBaseTestDir() {<a
name="line.196"></a>
+<span class="sourceLineNo">197</span> String PathName =
System.getProperty(<a name="line.197"></a>
+<span class="sourceLineNo">198</span> BASE_TEST_DIRECTORY_KEY,
DEFAULT_BASE_TEST_DIRECTORY);<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> return new Path(PathName);<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @param dir Directory to delete<a
name="line.204"></a>
+<span class="sourceLineNo">205</span> * @return True if we deleted it.<a
name="line.205"></a>
+<span class="sourceLineNo">206</span> * @throws IOException<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> boolean deleteDir(final File dir)
throws IOException {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (dir == null || !dir.exists()) {<a
name="line.209"></a>
+<span class="sourceLineNo">210</span> return true;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> int ntries = 0;<a name="line.212"></a>
+<span class="sourceLineNo">213</span> do {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> ntries += 1;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> try {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (deleteOnExit())
FileUtils.deleteDirectory(dir);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return true;<a
name="line.217"></a>
+<span class="sourceLineNo">218</span> } catch (IOException ex) {<a
name="line.218"></a>
+<span class="sourceLineNo">219</span> LOG.warn("Failed to delete " +
dir.getAbsolutePath());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> } catch (IllegalArgumentException
ex) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.warn("Failed to delete " +
dir.getAbsolutePath(), ex);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } while (ntries < 30);<a
name="line.223"></a>
+<span class="sourceLineNo">224</span> return ntries < 30;<a
name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span>}<a name="line.226"></a>