/*
 * Licensed to ElasticSearch and Shay Banon under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. ElasticSearch 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.elasticsearch.test.unit.node.internal;

import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.node.internal.InternalSettingsPerparer;
import org.testng.annotations.Test;

import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;

public class InternalSettingsPerparerTests {
    @Test
    public void testIgnoreSystemProperties() {
        System.setProperty("es.node.zone", "foo");
        Tuple<Settings, Environment> tuple = InternalSettingsPerparer.prepareSettings(settingsBuilder().put("node.zone", "bar").build(), true);
        // Should use setting from the system property
        assertThat(tuple.v1().get("node.zone"), equalTo("foo"));

        tuple = InternalSettingsPerparer.prepareSettings(settingsBuilder().put("config.ignore_system_properties", true).put("node.zone", "bar").build(), true);
        // Should use setting from the system property
        assertThat(tuple.v1().get("node.zone"), equalTo("bar"));
    }
}

@@ -1053,24 +1053,111 @@
 gsPerparer;%0A
+import org.testng.annotations.AfterMethod;%0Aimport org.testng.annotations.BeforeMethod;%0A
 import org.t
@@ -1413,16 +1413,248 @@
  %7B%0A    @
+BeforeMethod%0A    public void setupSystemProperties() %7B%0A        System.setProperty(%22es.node.zone%22, %22foo%22);%0A    %7D%0A%0A    @AfterMethod%0A    public void cleanupSystemProperties() %7B%0A        System.clearProperty(%22es.node.zone%22);%0A    %7D%0A%0A    @
 Test%0A   
@@ -1700,59 +1700,8 @@
 () %7B
-%0A        System.setProperty(%22es.node.zone%22, %22foo%22);
 %0A   

Add proper cleanup to InternalSettingsPerparerTests