Projects >> elasticsearch >>713009df37ec1fc8c2ef4b9da00d2e179ffaa5f7

Chunk
Conflicting content 
            "jvm", "true",
            "classname", "FakePlugin");

<<<<<<< HEAD
        Path binDir = environment.binFile();
=======
        Environment env = initialSettings.v2();
        Path binDir = env.binFile();
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399
        Path pluginBinDir = binDir.resolve(pluginName);

        Path pluginConfigDir = environment.configFile().resolve(pluginName);
Solution content 
            "jvm", "true",
            "classname", "FakePlugin");

        Path binDir = environment.binFile();
        Path pluginBinDir = binDir.resolve(pluginName);

        Path pluginConfigDir = environment.configFile().resolve(pluginName);
File
PluginManagerIT.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
            "java.version", System.getProperty("java.specification.version"),
            "jvm", "true",
            "classname", "FakePlugin");
<<<<<<< HEAD
=======

        Environment env = initialSettings.v2();
        Path pluginConfigDir = env.configFile().resolve(pluginName);
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399

        Path pluginConfigDir = environment.configFile().resolve(pluginName);
Solution content 
            "java.version", System.getProperty("java.specification.version"),
            "jvm", "true",
            "classname", "FakePlugin");

        Path pluginConfigDir = environment.configFile().resolve(pluginName);
File
PluginManagerIT.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                "jvm", "true",
                "classname", "FakePlugin");

<<<<<<< HEAD
        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
=======
        assertStatusOk(String.format(Locale.ROOT, "install %s --url %s --verbose", pluginName, pluginUrl));
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399

        assertFileContent(pluginConfigDir, "test.txt", "version1");
        assertFileContent(pluginConfigDir, "test.txt.new", "version2");
Solution content 
                "jvm", "true",
                "classname", "FakePlugin");

        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));

        assertFileContent(pluginConfigDir, "test.txt", "version1");
        assertFileContent(pluginConfigDir, "test.txt.new", "version2");
File
PluginManagerIT.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            "jvm", "true",
            "classname", "FakePlugin");

<<<<<<< HEAD
        Path binDir = environment.binFile();
=======
        Environment env = initialSettings.v2();
        Path binDir = env.binFile();
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399
        Path pluginBinDir = binDir.resolve(pluginName);

        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
Solution content 
            "jvm", "true",
            "classname", "FakePlugin");

        Path binDir = environment.binFile();
        Path pluginBinDir = binDir.resolve(pluginName);

        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
File
PluginManagerIT.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
            "java.version", System.getProperty("java.specification.version"),
            "jvm", "true",
            "classname", "FakePlugin");
<<<<<<< HEAD
        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
=======
        String command = String.format(Locale.ROOT, "install %s --url %s", pluginName, pluginUrl);
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args(command));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Name: fake-plugin"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Description:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Site:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Version:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("JVM:"))));
        assertThatPluginIsListed(pluginName);
    }

    public void testInstallSitePluginVerbose() throws IOException {
        String pluginName = "fake-plugin";
        Path pluginDir = createTempDir().resolve(pluginName);
        Files.createDirectories(pluginDir.resolve("_site"));
        Files.createFile(pluginDir.resolve("_site").resolve("somefile"));
        String pluginUrl = createPlugin(pluginDir,
                "description", "fake desc",
                "version", "1.0",
                "site", "true");
        String command = String.format(Locale.ROOT, "install %s --url %s --verbose", pluginName, pluginUrl);
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args(command));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Name: fake-plugin")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Description: fake desc")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Site: true")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Version: 1.0")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("JVM: false")));
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399
        assertThatPluginIsListed(pluginName);
        // We want to check that Plugin Manager moves content to _site
        assertFileExists(initialSettings.v2().pluginsFile().resolve(pluginName).resolve("_site"));
Solution content 
            "java.version", System.getProperty("java.specification.version"),
            "jvm", "true",
            "classname", "FakePlugin");
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args("install " + pluginUrl));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Name: fake-plugin"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Description:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Site:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Version:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("JVM:"))));
        assertThatPluginIsListed(pluginName);
    }

    public void testInstallSitePluginVerbose() throws IOException {
        String pluginName = "fake-plugin";
        Path pluginDir = createTempDir().resolve(pluginName);
        Files.createDirectories(pluginDir.resolve("_site"));
        Files.createFile(pluginDir.resolve("_site").resolve("somefile"));
        String pluginUrl = createPlugin(pluginDir,
                "description", "fake desc",
                "name", pluginName,
                "version", "1.0",
                "site", "true");
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args("install " + pluginUrl + " --verbose"));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Name: fake-plugin")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Description: fake desc")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Site: true")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("Version: 1.0")));
        assertThat(terminal.getTerminalOutput(), hasItem(containsString("JVM: false")));
        assertThatPluginIsListed(pluginName);
        // We want to check that Plugin Manager moves content to _site
File
PluginManagerIT.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        Files.createDirectories(pluginDir.resolve("_site"));
        Files.createFile(pluginDir.resolve("_site").resolve("somefile"));
        String pluginUrl = createPlugin(pluginDir,
<<<<<<< HEAD
            "description", "fake desc",
            "name", pluginName,
            "version", "1.0",
            "site", "true");
        assertStatusOk(String.format(Locale.ROOT, "install %s --verbose", pluginUrl));
=======
                "description", "fake desc",
                "version", "1.0",
                "site", "true");
        String command = String.format(Locale.ROOT, "install %s --url %s", pluginName, pluginUrl);
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args(command));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Name: fake-plugin"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Description:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Site:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Version:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("JVM:"))));
>>>>>>> 3fa3b1597f590bce6dfeb632e3ea7bf961e70399
        assertThatPluginIsListed(pluginName);
        // We want to check that Plugin Manager moves content to _site
        assertFileExists(environment.pluginsFile().resolve(pluginName).resolve("_site"));
Solution content 
        Files.createDirectories(pluginDir.resolve("_site"));
        Files.createFile(pluginDir.resolve("_site").resolve("somefile"));
        String pluginUrl = createPlugin(pluginDir,
            "description", "fake desc",
            "name", pluginName,
            "version", "1.0",
            "site", "true");
        ExitStatus status = new PluginManagerCliParser(terminal).execute(args("install " + pluginUrl));
        assertThat("Terminal output was: " + terminal.getTerminalOutput(), status, is(ExitStatus.OK));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Name: fake-plugin"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Description:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Site:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("Version:"))));
        assertThat(terminal.getTerminalOutput(), not(hasItem(containsString("JVM:"))));
        assertThatPluginIsListed(pluginName);
        // We want to check that Plugin Manager moves content to _site
        assertFileExists(environment.pluginsFile().resolve(pluginName).resolve("_site"));
File
PluginManagerIT.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable