Projects >> zanata-server >>50edbbc2faea860eca1caf72e1e61998002aceff

Chunk
Conflicting content 
 */
package org.zanata.feature.glossary;

<<<<<<< HEAD
import static org.hamcrest.MatcherAssert.assertThat;

import java.io.File;
import java.util.List;

import lombok.extern.slf4j.Slf4j;

import org.hamcrest.Matchers;
=======
import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
>>>>>>> b1b4ed98575189d78ac8a041dffcc2be3e596e50
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
Solution content 
 */
package org.zanata.feature.glossary;

import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
File
GlossaryDeleteTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
<<<<<<< HEAD
import org.zanata.feature.ConcordionTest;
import org.zanata.feature.ZanataTestCase;
=======
import org.zanata.feature.testharness.ZanataTestCase;
import org.zanata.feature.testharness.TestPlan.DetailedTest;
>>>>>>> b1b4ed98575189d78ac8a041dffcc2be3e596e50
import org.zanata.page.webtrans.EditorPage;
import org.zanata.util.SampleProjectRule;
import org.zanata.workflow.ClientWorkFlow;
Solution content 
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TestRule;
import org.zanata.feature.testharness.ZanataTestCase;
import org.zanata.feature.testharness.TestPlan.DetailedTest;
import org.zanata.page.webtrans.EditorPage;
import org.zanata.util.SampleProjectRule;
import org.zanata.workflow.ClientWorkFlow;
File
GlossaryDeleteTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                .as("The glossary result in row 2, column 2 is correct");
    }

<<<<<<< HEAD
    public EditorPage translate(String locale) {
        return new BasicWorkFlow().goToEditor("about-fedora", "master",
                locale, "About_Fedora");
=======
    @Test
    public void unauthorizedGlossaryDeleteRejected() throws Exception {
        List result = clientWorkFlow .callWithTimeout(
                projectRootPath, pushCommand + userConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isTrue()
                .as("Glossary push was successful");
        result = clientWorkFlow .callWithTimeout(
                projectRootPath, deleteCommand + basicUserConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isFalse()
                .as("Glossary delete was not successful");
>>>>>>> b1b4ed98575189d78ac8a041dffcc2be3e596e50
    }

}
Solution content 
                .as("The glossary result in row 2, column 2 is correct");
    }

    @Test
    public void unauthorizedGlossaryDeleteRejected() throws Exception {
        List result = clientWorkFlow .callWithTimeout(
                projectRootPath, pushCommand + userConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isTrue()
                .as("Glossary push was successful");
        result = clientWorkFlow .callWithTimeout(
                projectRootPath, deleteCommand + basicUserConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isFalse()
                .as("Glossary delete was not successful");
    }

}
File
GlossaryDeleteTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
/**
>>>>>>> b1b4ed98575189d78ac8a041dffcc2be3e596e50

import org.zanata.workflow.ClientWorkFlow;
import org.zanata.workflow.LoginWorkFlow;

<<<<<<< HEAD
=======
import java.io.File;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
 * @see TCMS case
Solution content 
import org.zanata.workflow.ClientWorkFlow;
import org.zanata.workflow.LoginWorkFlow;

import java.io.File;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;

/**
 * @see TCMS case
File
GlossaryPushTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        return Joiner.on("\n").join(output);
    }

<<<<<<< HEAD
    public void translate() {
        new LoginWorkFlow().signIn("translator", "translator");
        editorPage =
                new BasicWorkFlow().goToEditor("about-fedora",
                        "master", "fr", "About_Fedora");
=======
    @Test
    public void unauthorizedGlossaryPushRejected() throws Exception {
        List result = clientWorkFlow .callWithTimeout(
                projectRootPath, pushCommand + userConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isTrue()
                .as("Glossary push was successful");
>>>>>>> b1b4ed98575189d78ac8a041dffcc2be3e596e50
    }

}
Solution content 
        return Joiner.on("\n").join(output);
    }

    @Test
    public void unauthorizedGlossaryPushRejected() throws Exception {
        List result = clientWorkFlow .callWithTimeout(
                projectRootPath, pushCommand + userConfigPath);
        assertThat(clientWorkFlow.isPushSuccessful(result)).isTrue()
                .as("Glossary push was successful");
    }

}
File
GlossaryPushTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Method invocation
Method signature
Variable