Projects >> wro4j >>7fa797b9d1941f51b816f19f31f02da3995123d0

Chunk
Conflicting content 
  @Mock
  private MBeanServer mockMBeanServer;
  @Mock
<<<<<<< HEAD
  private ResourceLocator mockLocator;
  
=======
  private UriLocator mockUriLocator;

>>>>>>> e9a620c9023028fcf06b7c11c9564980edab1794
  @BeforeClass
  public static void onBeforeClass() {
    assertEquals(0, Context.countActive());
Solution content 
  @Mock
  private MBeanServer mockMBeanServer;
  @Mock
  private ResourceLocator mockLocator;

  @BeforeClass
  public static void onBeforeClass() {
    assertEquals(0, Context.countActive());
File
TestWroFilter.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
      throws Exception {
    Context.set(Context.standaloneContext());
    MockitoAnnotations.initMocks(this);
<<<<<<< HEAD
    
    when(mockLocatorFactory.getLocator(Mockito.anyString())).thenReturn(mockLocator);
    when(mockLocatorFactory.locate(Mockito.anyString())).thenReturn(WroUtil.EMPTY_STREAM);
    when(mockLocator.getInputStream()).thenReturn(WroUtil.EMPTY_STREAM);
    
=======

    when(mockUriLocatorFactory.getInstance(Mockito.anyString())).thenReturn(mockUriLocator);
    when(mockUriLocator.locate(Mockito.anyString())).thenReturn(WroUtil.EMPTY_STREAM);
    when(mockUriLocatorFactory.locate(Mockito.anyString())).thenReturn(WroUtil.EMPTY_STREAM);

>>>>>>> e9a620c9023028fcf06b7c11c9564980edab1794
    when(mockRequest.getAttribute(Mockito.anyString())).thenReturn(null);
    when(mockManagerFactory.create()).thenReturn(new BaseWroManagerFactory().create());
    when(mockFilterConfig.getServletContext()).thenReturn(mockServletContext);
Solution content 
      throws Exception {
    Context.set(Context.standaloneContext());
    MockitoAnnotations.initMocks(this);

    when(mockLocatorFactory.getLocator(Mockito.anyString())).thenReturn(mockLocator);
    when(mockLocatorFactory.locate(Mockito.anyString())).thenReturn(WroUtil.EMPTY_STREAM);
    when(mockLocator.getInputStream()).thenReturn(WroUtil.EMPTY_STREAM);

    when(mockRequest.getAttribute(Mockito.anyString())).thenReturn(null);
    when(mockManagerFactory.create()).thenReturn(new BaseWroManagerFactory().create());
    when(mockFilterConfig.getServletContext()).thenReturn(mockServletContext);
File
TestWroFilter.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        managerClass.getName());

    victim.init(mockFilterConfig);
<<<<<<< HEAD
    final Class actualClass = ((DefaultWroManagerFactory) AbstractDecorator.getOriginalDecoratedObject(victim
        .getWroManagerFactory())).getFactory().getClass();
    Assert.assertSame(managerClass, actualClass);
=======
    final Class actualClass = ((DefaultWroManagerFactory) AbstractDecorator.getOriginalDecoratedObject(victim.getWroManagerFactory())).getFactory().getClass();
    assertSame(managerClass, actualClass);
>>>>>>> e9a620c9023028fcf06b7c11c9564980edab1794
  }

  public static class TestWroManagerFactory
Solution content 
        managerClass.getName());

    victim.init(mockFilterConfig);
    final Class actualClass = ((DefaultWroManagerFactory) AbstractDecorator.getOriginalDecoratedObject(victim
        .getWroManagerFactory())).getFactory().getClass();
    assertSame(managerClass, actualClass);
  }

  public static class TestWroManagerFactory
File
TestWroFilter.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable