Projects >> errai >>ed385338b3bdcc53f7df831cecd950442b12bdee

Chunk
Conflicting content 
  public void testBusReadyEventObserver() {
    Timer timer = new Timer() {
      public void run() {
<<<<<<< HEAD
        assertEquals("Wrong number of BusReadyEvents received:", 1, EventObserverTestModule.getInstance()
                .getBusReadyEventsReceived());
=======
        assertEquals("Wrong number of BusReadyEvents received:", 1, 
            EventObserverTestModule.getInstance().getBusReadyEventsReceived());
        
>>>>>>> 29aae7d9030753c0a50416e20061fbac78ec52ee
        finishTest();
      }
    };
Solution content 
  public void testBusReadyEventObserver() {
    Timer timer = new Timer() {
      public void run() {
        assertEquals("Wrong number of BusReadyEvents received:", 1,
                EventObserverTestModule.getInstance().getBusReadyEventsReceived());
        finishTest();
      }
    };
File
EventObserverIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
  }

  public void testEventObservers() {
<<<<<<< HEAD
    assertNotNull(EventObserverTestModule.getInstance().getStartEvent());
    EventObserverTestModule.getInstance().start();

    Timer timer = new Timer() {
      public void run() {
        Map> actualEvents = EventObserverTestModule.getInstance().getReceivedEvents();

        // assert that client received all events
        EventObserverIntegrationTest.this.verifyEvents(actualEvents);
        finishTest();
      }
=======
    runAfterInit(new Runnable() {
      @Override
      public void run() {
        assertNotNull(EventObserverTestModule.getInstance().getStartEvent());
        EventObserverTestModule.getInstance().start();
      }
    }, 2000);
    
    final Timer timer = new Timer() {
      public void run() {
        Map> actualEvents = EventObserverTestModule.getInstance().getReceivedEvents();

        // assert that client received all events
        EventObserverIntegrationTest.this.verifyEvents(actualEvents);
        finishTest();
      }
>>>>>>> 29aae7d9030753c0a50416e20061fbac78ec52ee
    };
    timer.schedule(20000);
    delayTestFinish(25000);
Solution content 
  }

  public void testEventObservers() {
    assertNotNull(EventObserverTestModule.getInstance().getStartEvent());
    EventObserverTestModule.getInstance().start();

    Timer timer = new Timer() {
      public void run() {
        Map> actualEvents = EventObserverTestModule.getInstance().getReceivedEvents();

        // assert that client received all events
        EventObserverIntegrationTest.this.verifyEvents(actualEvents);
        finishTest();
      }

    };
    timer.schedule(20000);
    delayTestFinish(25000);
File
EventObserverIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
          fail("Did not receive a BusReadyEvent!");
        }
      }
<<<<<<< HEAD
    };
    testInitTimer.schedule(5000);

    final Timer testResultTimer = new Timer() {
      public void run() {
        Map> actualEvents = EventProducerTestModule.getInstance().getReceivedEventsOnServer();

=======
    }, 2000);
    
    final Timer testResultTimer = new Timer() {
      public void run() {
        Map> actualEvents = EventProducerTestModule.getInstance().getReceivedEventsOnServer();

>>>>>>> 29aae7d9030753c0a50416e20061fbac78ec52ee
        // assert that the server received all events
        EventProducerIntegrationTest.this.verifyEvents(actualEvents);
        finishTest();
Solution content 
          fail("Did not receive a BusReadyEvent!");
        }
      }
    };
    testInitTimer.schedule(5000);

    final Timer testResultTimer = new Timer() {
      public void run() {
        Map> actualEvents = EventProducerTestModule.getInstance().getReceivedEventsOnServer();


        // assert that the server received all events
        EventProducerIntegrationTest.this.verifyEvents(actualEvents);
        finishTest();
File
EventProducerIntegrationTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable