From dc29e1bd384139de00805430ff4a2652ca33c92a Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Mon, 20 Apr 2015 06:30:30 +0900
Subject: [PATCH] Fix Interpreter.getProperty() which was not really combine
 default property and given property.

---
 .../zeppelin/interpreter/Interpreter.java     |  2 +-
 .../zeppelin/interpreter/InterpreterTest.java | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
index 3f7d35aa2a0..b6d0257e04b 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
@@ -148,7 +148,7 @@ public Properties getProperty() {
     Map<String, InterpreterProperty> defaultProperties = Interpreter
         .findRegisteredInterpreterByClassName(getClassName()).getProperties();
     for (String k : defaultProperties.keySet()) {
-      if (!p.contains(k)) {
+      if (!p.containsKey(k)) {
         String value = defaultProperties.get(k).getDefaultValue();
         if (value != null) {
           p.put(k, defaultProperties.get(k).getDefaultValue());
diff --git a/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java
new file mode 100644
index 00000000000..e10bb3217a5
--- /dev/null
+++ b/zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/InterpreterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.zeppelin.interpreter;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
+import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterA;
+import org.junit.Test;
+
+public class InterpreterTest {
+
+  @Test
+  public void testDefaultProperty() {
+    Properties p = new Properties();
+    MockInterpreterA intp = new MockInterpreterA(p);
+
+    assertEquals(1, intp.getProperty().size());
+    assertEquals("v1", intp.getProperty().get("p1"));
+    assertEquals("v1", intp.getProperty("p1"));
+  }
+
+  @Test
+  public void testOverridedProperty() {
+    Properties p = new Properties();
+    p.put("p1", "v2");
+    MockInterpreterA intp = new MockInterpreterA(p);
+
+    assertEquals(1, intp.getProperty().size());
+    assertEquals("v2", intp.getProperty().get("p1"));
+    assertEquals("v2", intp.getProperty("p1"));
+  }
+
+  @Test
+  public void testAdditionalProperty() {
+    Properties p = new Properties();
+    p.put("p2", "v2");
+    MockInterpreterA intp = new MockInterpreterA(p);
+
+    assertEquals(2, intp.getProperty().size());
+    assertEquals("v1", intp.getProperty().get("p1"));
+    assertEquals("v1", intp.getProperty("p1"));
+    assertEquals("v2", intp.getProperty().get("p2"));
+    assertEquals("v2", intp.getProperty("p2"));
+  }
+
+}