Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90C5D11E3F for ; Mon, 16 Jun 2014 22:57:54 +0000 (UTC) Received: (qmail 9865 invoked by uid 500); 16 Jun 2014 22:57:54 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 9826 invoked by uid 500); 16 Jun 2014 22:57:54 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 9815 invoked by uid 99); 16 Jun 2014 22:57:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2014 22:57:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jun 2014 22:57:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 269822388A67; Mon, 16 Jun 2014 22:57:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603018 - /hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java Date: Mon, 16 Jun 2014 22:57:31 -0000 To: commits@hive.apache.org From: hashutosh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140616225731.269822388A67@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hashutosh Date: Mon Jun 16 22:57:30 2014 New Revision: 1603018 URL: http://svn.apache.org/r1603018 Log: HIVE-7201 : Fix TestHiveConf#testConfProperties test case (Pankit Thapar via Ashutosh Chauhan) Modified: hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java Modified: hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java URL: http://svn.apache.org/viewvc/hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java?rev=1603018&r1=1603017&r2=1603018&view=diff ============================================================================== --- hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java (original) +++ hive/trunk/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java Mon Jun 16 22:57:30 2014 @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.conf; -import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.util.Shell; @@ -36,7 +36,7 @@ public class TestHiveConf { @Test public void testHiveSitePath() throws Exception { String expectedPath = HiveTestUtils.getFileFromClasspath("hive-site.xml"); - String hiveSiteLocation = new HiveConf().getHiveSiteLocation().getPath(); + String hiveSiteLocation = HiveConf.getHiveSiteLocation().getPath(); if (Shell.WINDOWS) { // Do case-insensitive comparison on Windows, as drive letter can have different case. expectedPath = expectedPath.toLowerCase(); @@ -46,7 +46,7 @@ public class TestHiveConf { } private void checkHadoopConf(String name, String expectedHadoopVal) throws Exception { - Assert.assertEquals(expectedHadoopVal, new Configuration().get(name)); + Assert.assertEquals(expectedHadoopVal, new JobConf(HiveConf.class).get(name)); } private void checkConfVar(ConfVars var, String expectedConfVarVal) throws Exception {