diff --git common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
index cd472c7..365d500 100644
--- common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
+++ common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
@@ -80,13 +80,13 @@ public void testConfProperties() throws Exception {
checkHiveConf(ConfVars.HIVESKEWJOINKEY.varname, "100000");
// ConfVar overridden in in hive-site.xml
- checkHadoopConf(ConfVars.METASTORE_CONNECTION_DRIVER.varname, null);
- checkConfVar(ConfVars.METASTORE_CONNECTION_DRIVER, "org.apache.derby.jdbc.EmbeddedDriver");
- checkHiveConf(ConfVars.METASTORE_CONNECTION_DRIVER.varname, "hive-site.xml");
+ checkHadoopConf(ConfVars.HIVETESTMODEDUMMYSTATAGGR.varname, null);
+ checkConfVar(ConfVars.HIVETESTMODEDUMMYSTATAGGR, "");
+ checkHiveConf(ConfVars.HIVETESTMODEDUMMYSTATAGGR.varname, "value2");
// Property defined in hive-site.xml only
checkHadoopConf("test.property1", null);
- checkHiveConf("test.property1", "hive-site.xml");
+ checkHiveConf("test.property1", "value1");
// Test HiveConf property variable substitution in hive-site.xml
checkHiveConf("test.var.hiveconf.property", ConfVars.DEFAULTPARTITIONNAME.getDefaultValue());
diff --git common/src/test/resources/hive-site.xml common/src/test/resources/hive-site.xml
deleted file mode 100644
index 0d5c834..0000000
--- common/src/test/resources/hive-site.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
- javax.jdo.option.ConnectionDriverName
- hive-site.xml
- Override ConfVar defined in HiveConf
-
-
-
- test.property1
- hive-site.xml
- Test property defined in hive-site.xml only
-
-
-
- test.var.hiveconf.property
- ${hive.exec.default.partition.name}
- Test hiveconf property substitution
-
-
-
diff --git data/conf/hive-site.xml data/conf/hive-site.xml
index 84005b4..2a5f891 100644
--- data/conf/hive-site.xml
+++ data/conf/hive-site.xml
@@ -244,6 +244,23 @@
+ test.var.hiveconf.property
+ ${hive.exec.default.partition.name}
+ Test hiveconf property substitution
+
+
+
+ test.property1
+ value1
+ Test property defined in hive-site.xml only
+
+
+
+ hive.test.dummystats.aggregator
+ value2
+
+
+
hive.fetch.task.conversion
minimal