Projects >> jolokia >>1e0a4779938decc9c580bc8044f394de59cbb15b

Chunk
Conflicting content 
    private LogHandler log = new LogHandler.StdoutLogHandler(true);

<<<<<<< HEAD
    private TestJolokiaContext createContext(Object ... configKeysAndValues) {
        TestJolokiaContext.Builder builder =
                new TestJolokiaContext.Builder()
                .services(JmxSerializer.class,new Converters());
        if (configKeysAndValues.length > 0) {
            builder.config(ConfigKey.DEBUG, "true");
        }
        ctx = builder.build();
        return ctx;
    }
=======
    @BeforeTest
    public void setup() {
        config = new Configuration(ConfigKey.AGENT_ID,"test");
    }
    @Test
    public void simpleRead() throws MalformedObjectNameException, InstanceNotFoundException, IOException, ReflectionException, AttributeNotFoundException, MBeanException {
        Configuration config = new Configuration(ConfigKey.DEBUG,"true",ConfigKey.AGENT_ID,"test");
>>>>>>> 4417ab313adc3b9acadebb1e68fa8e6043e4abcf

    @Test
    public void simpleRead() throws JMException, IOException {
Solution content 
    private LogHandler log = new LogHandler.StdoutLogHandler(true);

    private TestJolokiaContext createContext(Object ... configKeysAndValues) {
        TestJolokiaContext.Builder builder =
                new TestJolokiaContext.Builder()
                .services(JmxSerializer.class,new Converters());
        if (configKeysAndValues.length > 0) {
            builder.config(ConfigKey.DEBUG, "true");
        }
        builder.config(ConfigKey.AGENT_ID,"test");
        ctx = builder.build();
        return ctx;
    }

    @Test
    public void simpleRead() throws JMException, IOException {
File
BackendManagerTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        assertTrue((Long) ((Map) ret.get("value")).get("used") > 0);
    }

<<<<<<< HEAD
    private BackendManager createBackendManager(Object[] pContextParams) {
        JolokiaContext ctx = createContext(pContextParams);
        return new BackendManager(ctx, new TestRequestDispatcher(ctx));
=======
    @Test
    public void notChanged() throws MalformedObjectNameException, MBeanException, AttributeNotFoundException, ReflectionException, InstanceNotFoundException, IOException {
        Configuration config = new Configuration(ConfigKey.DISPATCHER_CLASSES,RequestDispatcherTest.class.getName(),ConfigKey.AGENT_ID,"test");
        BackendManager backendManager = new BackendManager(config, log);
        JmxRequest req = new JmxRequestBuilder(RequestType.LIST).build();
        JSONObject ret = backendManager.handleRequest(req);
        assertEquals(ret.get("status"),304);
        backendManager.destroy();
>>>>>>> 4417ab313adc3b9acadebb1e68fa8e6043e4abcf
    }
Solution content 
        assertTrue((Long) ((Map) ret.get("value")).get("used") > 0);
    }

    private BackendManager createBackendManager(Object[] pContextParams) {
        JolokiaContext ctx = createContext(pContextParams);
        return new BackendManager(ctx, new TestRequestDispatcher(ctx));
    }
File
BackendManagerTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
        assertTrue((Long) ((Map) ret.get("value")).get("used") > 0);
    }

<<<<<<< HEAD

   @Test
    public void defaultConfig() {
        BackendManager backendManager = createBackendManager(new Object[] {  ConfigKey.DEBUG_MAX_ENTRIES,"blabal" });
=======
    @Test
    public void requestDispatcher() throws MalformedObjectNameException, InstanceNotFoundException, IOException, ReflectionException, AttributeNotFoundException, MBeanException {
        config = new Configuration(ConfigKey.DISPATCHER_CLASSES,RequestDispatcherTest.class.getName(),ConfigKey.AGENT_ID,"test");
        BackendManager backendManager = new BackendManager(config, log);
        JmxRequest req = new JmxRequestBuilder(RequestType.READ,"java.lang:type=Memory").build();
        backendManager.handleRequest(req);
        assertTrue(RequestDispatcherTest.called);
        backendManager.destroy();
    }

    @Test(expectedExceptions = IllegalArgumentException.class,expectedExceptionsMessageRegExp = ".*invalid constructor.*")
    public void requestDispatcherWithWrongDispatcher() throws MalformedObjectNameException, InstanceNotFoundException, IOException, ReflectionException, AttributeNotFoundException, MBeanException {
        Configuration config = new Configuration(ConfigKey.DISPATCHER_CLASSES,RequestDispatcherWrong.class.getName(),ConfigKey.AGENT_ID,"test");
        new BackendManager(config,log);
    }

    @Test(expectedExceptions = IllegalArgumentException.class,expectedExceptionsMessageRegExp = ".*blub.bla.Dispatcher.*")
    public void requestDispatcherWithUnkownDispatcher() throws MalformedObjectNameException, InstanceNotFoundException, IOException, ReflectionException, AttributeNotFoundException, MBeanException {
        Configuration config = new Configuration(ConfigKey.DISPATCHER_CLASSES,"blub.bla.Dispatcher",ConfigKey.AGENT_ID,"test");
        new BackendManager(config,log);
    }

    @Test
    public void debugging() {
        RecordingLogHandler lhandler = new RecordingLogHandler();
        BackendManager backendManager = new BackendManager(config,lhandler);
        lhandler.error = 0;
        lhandler.debug = 0;
        lhandler.info = 0;

        backendManager.debug("test");
        assertEquals(lhandler.debug,1);
        backendManager.error("test",new Exception());
        assertEquals(lhandler.error,1);
        backendManager.info("test");
        assertEquals(lhandler.info,1);
        backendManager.destroy();
    }

    @Test
    public void defaultConfig() {
        Configuration config = new Configuration(ConfigKey.DEBUG_MAX_ENTRIES,"blabal",ConfigKey.AGENT_ID,"test");
        BackendManager backendManager = new BackendManager(config,log);
        backendManager.destroy();
>>>>>>> 4417ab313adc3b9acadebb1e68fa8e6043e4abcf
    }

    @Test
Solution content 
        assertTrue((Long) ((Map) ret.get("value")).get("used") > 0);
    }

   @Test
    public void defaultConfig() {
        BackendManager backendManager = createBackendManager(new Object[] {  ConfigKey.DEBUG_MAX_ENTRIES,"blabal" });
    }

    @Test
File
BackendManagerTest.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    @Test
    public void withException() throws ServletException, IOException {
        servlet = new AgentServlet(new AllowAllRestrictor());
<<<<<<< HEAD
        initConfigMocks(new String[] { ConfigKey.DEBUG.getKeyValue(), "true" }, null,"500", IllegalStateException.class);
        replay(config, context);
        servlet.init(config);

=======
        initConfigMocks(null, null,"Error 500", IllegalStateException.class);
        replay(config, context);
        servlet.init(config);
>>>>>>> 4417ab313adc3b9acadebb1e68fa8e6043e4abcf
        StringWriter sw = initRequestResponseMocks(
                new Runnable() {
                    public void run() {
Solution content 
    @Test
    public void withException() throws ServletException, IOException {
        servlet = new AgentServlet(new AllowAllRestrictor());

        initConfigMocks(new String[] { ConfigKey.DEBUG.getKeyValue(), "true" }, null,"500", IllegalStateException.class);
        replay(config, context);
        servlet.init(config);

        StringWriter sw = initRequestResponseMocks(
                new Runnable() {
                    public void run() {
File
AgentServletTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
/**
 */
public class RawObjectNameTest {
<<<<<<< HEAD
    private BackendManager backendManager =
            new BackendManager(new TestJolokiaContext(), new TestRequestDispatcher());
=======
    private Configuration config     = new Configuration(ConfigKey.AGENT_ID, UUID.randomUUID().toString());
    private LogHandler    logHandler = new LogHandler.StdoutLogHandler(false);

    private BackendManager backendManager = new BackendManager(config, logHandler, null, true /* Lazy Init */);
>>>>>>> 4417ab313adc3b9acadebb1e68fa8e6043e4abcf

    @Test
    public void testListRawObjectNameAccess() throws Exception {
Solution content 
/**
 */
public class RawObjectNameTest {
    private BackendManager backendManager =
            new BackendManager(new TestJolokiaContext(), new TestRequestDispatcher());

    @Test
    public void testListRawObjectNameAccess() throws Exception {
File
RawObjectNameTest.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation