Projects >> openengsb >>52eab3ee44e1770f73effddb6c85fae7e302d85c

Chunk
Conflicting content 
        ServiceReference reference = bundleContext.getServiceReferences(NullDomain.class.getName(), "")[0];
        Integer ranking = (Integer) reference.getProperty(Constants.SERVICE_RANKING);
<<<<<<< HEAD
        assertThat(new Long(ranking), new LessThan(0L));
=======
        assertThat(ranking, lessThan(0));
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
    }

    @Test
Solution content 
        ServiceReference reference = bundleContext.getServiceReferences(NullDomain.class.getName(), "")[0];
        Integer ranking = (Integer) reference.getProperty(Constants.SERVICE_RANKING);
        assertThat(ranking, lessThan(0));
    }

    @Test
File
ConnectorDeployerServiceTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.openengsb.ui.admin.userService.UserListPage;
import org.openengsb.ui.admin.wiringPage.WiringPage;
import org.openengsb.ui.admin.workflowEditor.WorkflowEditor;
<<<<<<< HEAD
import org.openengsb.ui.common.DomainAuthorizationStrategy;
=======
import org.openengsb.ui.api.OpenEngSBVersionService;
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
import org.ops4j.pax.wicket.api.PaxWicketBean;

@SuppressWarnings("serial")
Solution content 
import org.openengsb.ui.admin.userService.UserListPage;
import org.openengsb.ui.admin.wiringPage.WiringPage;
import org.openengsb.ui.admin.workflowEditor.WorkflowEditor;
import org.openengsb.ui.api.OpenEngSBVersionService;
import org.openengsb.ui.common.DomainAuthorizationStrategy;
import org.ops4j.pax.wicket.api.PaxWicketBean;

@SuppressWarnings("serial")
File
HeaderTemplate.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
package org.openengsb.ui.admin;

<<<<<<< HEAD
import static org.mockito.Mockito.mock;

=======
import java.util.ArrayList;
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
Solution content 
package org.openengsb.ui.admin;

import static org.mockito.Mockito.mock;

import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
File
AbstractUITest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.openengsb.core.services.internal.DefaultWiringService;
import org.openengsb.core.test.AbstractOsgiMockServiceTest;
import org.openengsb.core.test.DummyPersistenceManager;
<<<<<<< HEAD
import org.openengsb.core.test.UserManagerStub;
import org.openengsb.domain.authorization.AuthorizationDomain;
import org.openengsb.ui.admin.model.OpenEngSBVersion;
=======
import org.openengsb.ui.admin.model.OpenEngSBFallbackVersion;
import org.openengsb.ui.api.OpenEngSBVersionService;
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
import org.ops4j.pax.wicket.test.spring.ApplicationContextMock;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;
import org.osgi.framework.BundleContext;
Solution content 
import org.openengsb.core.services.internal.DefaultWiringService;
import org.openengsb.core.test.AbstractOsgiMockServiceTest;
import org.openengsb.core.test.DummyPersistenceManager;
import org.openengsb.core.test.UserManagerStub;
import org.openengsb.domain.authorization.AuthorizationDomain;
import org.openengsb.ui.admin.model.OpenEngSBFallbackVersion;
import org.openengsb.ui.api.OpenEngSBVersionService;
import org.ops4j.pax.wicket.test.spring.ApplicationContextMock;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;
import org.osgi.framework.BundleContext;
File
AbstractUITest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        context = new ApplicationContextMock();
        tester.getApplication().addComponentInstantiationListener(
            new PaxWicketSpringBeanComponentInjector(tester.getApplication(), context));
<<<<<<< HEAD
        contextCurrentService = mock(ContextCurrentService.class);
        context.putBean(contextCurrentService);
        context.putBean("openengsbVersion", new OpenEngSBVersion());
=======
        context.putBean(Mockito.mock(ContextCurrentService.class));
        context.putBean("openengsbVersion", new OpenEngSBFallbackVersion());
        List versionService = new ArrayList();
        context.putBean("openengsbVersionService", versionService);
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
        context.putBean(OpenEngSBCoreServices.getWiringService());
        OsgiUtilsService serviceUtilsService =
            OpenEngSBCoreServices.getServiceUtilsService().getOsgiServiceProxy(OsgiUtilsService.class);
Solution content 
        context = new ApplicationContextMock();
        tester.getApplication().addComponentInstantiationListener(
            new PaxWicketSpringBeanComponentInjector(tester.getApplication(), context));
        contextCurrentService = mock(ContextCurrentService.class);
        context.putBean(contextCurrentService);
        context.putBean("openengsbVersion", new OpenEngSBFallbackVersion());
        List versionService = new ArrayList();
        context.putBean("openengsbVersionService", versionService);
        context.putBean(OpenEngSBCoreServices.getWiringService());
        OsgiUtilsService serviceUtilsService =
            OpenEngSBCoreServices.getServiceUtilsService().getOsgiServiceProxy(OsgiUtilsService.class);
File
AbstractUITest.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba

import org.apache.wicket.Page;
import static org.mockito.Mockito.when;

import java.util.Arrays;
<<<<<<< HEAD
=======
import java.util.Collection;
import java.util.List;
import org.apache.wicket.authentication.AuthenticatedWebSession;
Solution content 
import static org.mockito.Mockito.when;

import java.util.Arrays;

import org.apache.wicket.Page;
import org.apache.wicket.authentication.AuthenticatedWebSession;
File
ProjectTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.openengsb.core.api.context.ContextHolder;
import org.openengsb.ui.admin.AbstractLoginTest;
import org.openengsb.ui.admin.basePage.BasePage;
<<<<<<< HEAD

public class ProjectTest extends AbstractLoginTest {
=======
import org.openengsb.ui.admin.index.Index;
import org.openengsb.ui.admin.model.OpenEngSBFallbackVersion;
import org.openengsb.ui.api.OpenEngSBVersionService;
import org.ops4j.pax.wicket.test.spring.ApplicationContextMock;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.GrantedAuthorityImpl;

public class ProjectTest {
    private WicketTester tester;
    private ContextCurrentService contextService;
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
    private Page basePage;

    @Before
Solution content 
import org.openengsb.core.api.context.ContextHolder;
import org.openengsb.ui.admin.AbstractLoginTest;
import org.openengsb.ui.admin.basePage.BasePage;

public class ProjectTest extends AbstractLoginTest {
    private Page basePage;

    @Before
File
ProjectTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class signature
Import
Chunk
Conflicting content 
         * this line should be reconsidered as soon as the root-context is implemented [OPENENGSB-974]
         */
        ContextHolder.get().setCurrentContextId(null);
<<<<<<< HEAD
=======
        contextService = mock(ContextCurrentService.class);
        appContext = new ApplicationContextMock();
        appContext.putBean(contextService);
        appContext.putBean("openengsbVersion", new OpenEngSBFallbackVersion());
        List versionService = new ArrayList();
        appContext.putBean("openengsbVersionService", versionService);
        mockAuthentication();
        tester = new WicketTester(new WebApplication() {

            @Override
            protected void init() {
                super.init();
                addComponentInstantiationListener(new PaxWicketSpringBeanComponentInjector(this, appContext));
            }

            @Override
            public Class getHomePage() {
                return Index.class;
            }

            @Override
            public Session newSession(Request request, Response response) {
                return new AdminWebSession(request);
            }
        });
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba

        // Maybe there is a more elegant way to do this...
        AuthenticatedWebSession session = AuthenticatedWebSession.get();
Solution content 
         * this line should be reconsidered as soon as the root-context is implemented [OPENENGSB-974]
         */
        ContextHolder.get().setCurrentContextId(null);

        // Maybe there is a more elegant way to do this...
        AuthenticatedWebSession session = AuthenticatedWebSession.get();
File
ProjectTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
import org.junit.Test;
import org.openengsb.ui.admin.AbstractUITest;
import org.openengsb.ui.admin.index.Index;
<<<<<<< HEAD
=======
import org.openengsb.ui.admin.model.OpenEngSBFallbackVersion;
import org.openengsb.ui.api.OpenEngSBVersionService;
import org.ops4j.pax.wicket.test.spring.ApplicationContextMock;
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;

import com.google.common.collect.ImmutableMap;
Solution content 
import org.junit.Test;
import org.openengsb.ui.admin.AbstractUITest;
import org.openengsb.ui.admin.index.Index;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;

import com.google.common.collect.ImmutableMap;
File
UserServiceTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }

    @Before
<<<<<<< HEAD
    public void setup() throws Exception {
=======
    public void setup() {
        tester = new WicketTester();
        context = new ApplicationContextMock();
        context.putBean(mock(ContextCurrentService.class));
        bundleContext = mock(BundleContext.class);
        context.putBean(bundleContext);
        context.putBean("openengsbVersion", new OpenEngSBFallbackVersion());
        List versionService = new ArrayList();
        context.putBean("openengsbVersionService", versionService);
        userManager = mock(UserManager.class);
        context.putBean("userManager", userManager);
>>>>>>> a4378128020257d550aa022299a76adab8bb31ba
        setupTesterWithSpringMockContext();
    }
Solution content 
    }

    @Before
    public void setup() throws Exception {
        setupTesterWithSpringMockContext();
    }
File
UserServiceTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Variable