Projects >> raven-java >>1dca9051eb1fc20e9f75ae6371b2d1f6f1747019

Chunk
Conflicting content 
import net.kencochrane.raven.event.Event;
<<<<<<< HEAD
import net.kencochrane.raven.event.EventBuilder;
import net.kencochrane.raven.event.interfaces.ExceptionInterface;
import net.kencochrane.raven.event.interfaces.StackTraceInterface;
=======
import net.kencochrane.raven.event.interfaces.MessageInterface;
>>>>>>> 84f74ee563391b083f227ab3013df8fa63cb24d3
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
Solution content 
import net.kencochrane.raven.event.Event;
import net.kencochrane.raven.event.EventBuilder;
import net.kencochrane.raven.event.interfaces.ExceptionInterface;
import net.kencochrane.raven.event.interfaces.MessageInterface;
import net.kencochrane.raven.event.interfaces.StackTraceInterface;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
File
SentryAppender.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
        SentryInterface exceptionInterface = event.getSentryInterfaces().get(ExceptionInterface.EXCEPTION_INTERFACE);
        assertThat(exceptionInterface, instanceOf(ExceptionInterface.class));

<<<<<<< HEAD
        // The object isn't exactly the same, but equals delegates to the actual exception in ImmutableThrowable.
        // This is _BAD_ and shouldn't be done, but it's the best way to do it in this particular case.
        assertThat(((ExceptionInterface) exceptionInterface).getThrowable(), Matchers.equalTo(exception));


        SentryInterface stackTraceInterface = event.getSentryInterfaces().get(StackTraceInterface.STACKTRACE_INTERFACE);
        assertThat(stackTraceInterface, instanceOf(StackTraceInterface.class));

        // The object isn't exactly the same, but equals delegates to the actual exception in ImmutableThrowable.
        // This is _BAD_ and shouldn't be done, but it's the best way to do it in this particular case.
        assertThat(((StackTraceInterface) stackTraceInterface).getThrowable(), Matchers.equalTo(exception));
=======
        Throwable capturedException = ((ExceptionInterface) exceptionInterface).getThrowable();

        assertThat(capturedException.getMessage(), is(exception.getMessage()));
        assertThat(capturedException.getStackTrace(), is(capturedException.getStackTrace()));
>>>>>>> 84f74ee563391b083f227ab3013df8fa63cb24d3
    }

    @Test
Solution content 
        SentryInterface exceptionInterface = event.getSentryInterfaces().get(ExceptionInterface.EXCEPTION_INTERFACE);
        assertThat(exceptionInterface, instanceOf(ExceptionInterface.class));

        Throwable capturedException = ((ExceptionInterface) exceptionInterface).getThrowable();
        assertThat(capturedException.getMessage(), is(exception.getMessage()));
        assertThat(capturedException.getStackTrace(), is(capturedException.getStackTrace()));

        SentryInterface stackTraceInterface = event.getSentryInterfaces().get(StackTraceInterface.STACKTRACE_INTERFACE);
        assertThat(stackTraceInterface, instanceOf(StackTraceInterface.class));

        Throwable stackTraceException = ((StackTraceInterface) stackTraceInterface).getThrowable();
        assertThat(stackTraceException.getMessage(), is(exception.getMessage()));
        assertThat(stackTraceException.getStackTrace(), is(capturedException.getStackTrace()));
    }

    @Test
File
AbstractLoggerTest.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable