Projects >> maven-soapui-extension-plugin >>9d83a8df7ff1965236f5441943e5b7bb7a404406

Chunk
Conflicting content
        log("The PRO war generator has been used");
    }

<<<<<<< HEAD
    public void assertLogFileContains(String expectedContent) {
        log("Expect to find content in the log file: " + expectedContent);
        int matchCount = StringUtils.countMatches(logFileContent, expectedContent);
        log("Found " + matchCount + " occurences");
        if (matchCount < 1) {
            logAndFail("FAILED! Did not find expected content in the log file: " + expectedContent);
        }
    }

    public void assertLogFileContainsOneOf(String... expected) {
        log("Expect to find one of the following in the log file: " + ArrayUtils.toString(expected));
        for (String string : expected) {
            int matchCount = StringUtils.countMatches(logFileContent, string);
            log("  Checking: " + string);
            log("  Found " + matchCount + " occurences");
            if (matchCount > 0) {
                return;
            }
        }
        logAndFail("FAILED! Did not find one of expected content in the log file");
    }

    public void assertLogFileDoesNotContain(String content) {
        log("Expect not to find content in the log file: " + content);
        int matchCount = StringUtils.countMatches(logFileContent, content);
        log("Found " + matchCount + " occurences");
        if (matchCount > 0) {
            logAndFail("FAILED! Found unexpected content in the log file: " + content);
        }
    }
=======
    // =================================================================================================================
    // SERVLET DEPLOYMENT CHECKS
    // =================================================================================================================
>>>>>>> e9ff1e03667db44dafefbce9da96a2ea26ce7517

    public void assertOssMockAsWarServletHasBeenDeployed() {
        log("Check that the OSS MockAsWar Servlet has been deployed");
Solution content
        log("The PRO war generator has been used");
    }

    // =================================================================================================================
    // SERVLET DEPLOYMENT CHECKS
    // =================================================================================================================

    public void assertOssMockAsWarServletHasBeenDeployed() {
        log("Check that the OSS MockAsWar Servlet has been deployed");
File
CheckBuildLog.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration