mirror of https://github.com/apache/jclouds.git
Removed duplicate tests
Having a deep look at this class noticed that most of the tests were duplicating tests in the AsyncMonitorTest class. All the functionallity provided by the awaitCompletion and monitor methods is already tested (and properly tested using mocks) in that class, so those methods have been removed. The BaseMonitoringService class just delegates to the AsyncMonitor one, adding a bit of logic to validate input parameters, so the BaseMonitoringServiceTest class now only tests the logic it is responsible for.
This commit is contained in:
Ignasi Barrera
parent
a71032df95
commit
dd7a129388
|
|
@ -19,20 +19,8 @@
|
|||
|
||||
package org.jclouds.abiquo.internal;
|
||||
|
||||
import static org.jclouds.abiquo.config.AbiquoProperties.ASYNC_TASK_MONITOR_DELAY;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.fail;
|
||||
|
||||
import java.util.Properties;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import org.jclouds.abiquo.events.handlers.BlockingEventHandler;
|
||||
import org.jclouds.abiquo.events.monitor.MonitorEvent;
|
||||
import org.jclouds.abiquo.features.services.MonitoringService;
|
||||
import org.jclouds.abiquo.monitor.MonitorStatus;
|
||||
import org.testng.annotations.Test;
|
||||
|
|
@ -44,28 +32,9 @@ import com.google.common.base.Function;
|
|||
*
|
||||
* @author Ignasi Barrera
|
||||
*/
|
||||
// Since these tests block the thread, mark them as failed after the given timeout
|
||||
@Test(groups = "unit", testName = "BaseMonitoringServiceTest")
|
||||
public class BaseMonitoringServiceTest extends BaseInjectionTest
|
||||
{
|
||||
// The maximum amount of time (in ms) to wait for each test to complete
|
||||
private static final long TEST_TIMEOUT = 10000L;
|
||||
|
||||
// The polling interval used in tests (in ms)
|
||||
private static final long TEST_MONITOR_POLLING = 100L;
|
||||
|
||||
// An executor used to control monitor unexpected timeouts
|
||||
private ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
@Override
|
||||
protected Properties buildProperties()
|
||||
{
|
||||
// Use a small monitor polling interval in tests (in ms)
|
||||
Properties props = super.buildProperties();
|
||||
props.setProperty(ASYNC_TASK_MONITOR_DELAY, String.valueOf(TEST_MONITOR_POLLING));
|
||||
return props;
|
||||
}
|
||||
|
||||
public void testAllPropertiesInjected()
|
||||
{
|
||||
BaseMonitoringService service =
|
||||
|
|
@ -92,152 +61,15 @@ public class BaseMonitoringServiceTest extends BaseInjectionTest
|
|||
service.awaitCompletion(new MockMonitor(), new Object[] {});
|
||||
}
|
||||
|
||||
public void testAwaitCompletion()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.awaitCompletion(new MockMonitor(), new Object());
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
}
|
||||
|
||||
public void testAwaitCompletionMultipleTasks()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.awaitCompletion(new MockMonitor(), new Object(), new Object());
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
}
|
||||
|
||||
@Test(expectedExceptions = NullPointerException.class)
|
||||
public void testMonitorWithNullCompletecondition()
|
||||
public void testMonitorWithNullCompleteCondition()
|
||||
{
|
||||
monitoringService().monitor(null, (Object[]) null);
|
||||
}
|
||||
|
||||
@Test(expectedExceptions = IllegalArgumentException.class)
|
||||
public void testBlockingHandlerWithoutArguments()
|
||||
public void testMonitorWithoutTasks()
|
||||
{
|
||||
new BlockingEventHandler<Object>();
|
||||
}
|
||||
|
||||
public void testMonitor()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
final Object monitoredObject = new Object();
|
||||
final CountingHandler handler = new CountingHandler(monitoredObject);
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.register(handler);
|
||||
service.monitor(new MockMonitor(), monitoredObject);
|
||||
handler.lock();
|
||||
service.unregister(handler);
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
|
||||
assertEquals(handler.numCompletes, 1);
|
||||
assertEquals(handler.numFailures, 0);
|
||||
assertEquals(handler.numTimeouts, 0);
|
||||
}
|
||||
|
||||
public void testMonitorMultipleTasks()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
final Object monitoredObject1 = new Object();
|
||||
final Object monitoredObject2 = new Object();
|
||||
final CountingHandler handler = new CountingHandler(monitoredObject1, monitoredObject2);
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.register(handler);
|
||||
service.monitor(new MockMonitor(), monitoredObject1, monitoredObject2);
|
||||
handler.lock();
|
||||
service.unregister(handler);
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
|
||||
assertEquals(handler.numCompletes, 2);
|
||||
assertEquals(handler.numFailures, 0);
|
||||
assertEquals(handler.numTimeouts, 0);
|
||||
}
|
||||
|
||||
public void testMonitorReachesTimeout()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
final Object monitoredObject = new Object();
|
||||
final CountingHandler handler = new CountingHandler(monitoredObject);
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.register(handler);
|
||||
service.monitor(TEST_MONITOR_POLLING + 10L, TimeUnit.MILLISECONDS,
|
||||
new MockInfiniteMonitor(), monitoredObject);
|
||||
handler.lock();
|
||||
service.unregister(handler);
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
|
||||
assertEquals(handler.numCompletes, 0);
|
||||
assertEquals(handler.numFailures, 0);
|
||||
assertEquals(handler.numTimeouts, 1);
|
||||
}
|
||||
|
||||
public void testMonitorMultipleTasksReachesTimeout()
|
||||
{
|
||||
final BaseMonitoringService service = monitoringService();
|
||||
final Object monitoredObject1 = new Object();
|
||||
final Object monitoredObject2 = new Object();
|
||||
final CountingHandler handler = new CountingHandler(monitoredObject1, monitoredObject2);
|
||||
|
||||
Future< ? > future = executor.submit(new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
service.register(handler);
|
||||
service.monitor(TEST_MONITOR_POLLING + 10L, TimeUnit.MILLISECONDS,
|
||||
new MockInfiniteMonitor(), monitoredObject1, monitoredObject2);
|
||||
handler.lock();
|
||||
service.unregister(handler);
|
||||
}
|
||||
});
|
||||
|
||||
waitForResultOrTimeout(future);
|
||||
|
||||
assertEquals(handler.numCompletes, 0);
|
||||
assertEquals(handler.numFailures, 0);
|
||||
assertEquals(handler.numTimeouts, 2);
|
||||
monitoringService().monitor(new MockMonitor());
|
||||
}
|
||||
|
||||
public void testDelegateToVirtualMachineMonitor()
|
||||
|
|
@ -265,75 +97,12 @@ public class BaseMonitoringServiceTest extends BaseInjectionTest
|
|||
return injector.getInstance(BaseMonitoringService.class);
|
||||
}
|
||||
|
||||
private void waitForResultOrTimeout(final Future< ? > future)
|
||||
{
|
||||
try
|
||||
{
|
||||
future.get(TEST_TIMEOUT, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
catch (TimeoutException ex)
|
||||
{
|
||||
fail("Test didn't finish within the timeout " + TEST_TIMEOUT);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
fail("Failed to process the asynchronous task");
|
||||
}
|
||||
}
|
||||
|
||||
private static class MockMonitor implements Function<Object, MonitorStatus>
|
||||
{
|
||||
private int finishAfterCount;
|
||||
|
||||
public MockMonitor()
|
||||
{
|
||||
this.finishAfterCount = 1; // Simulate task completion after one refresh
|
||||
}
|
||||
|
||||
@Override
|
||||
public MonitorStatus apply(final Object object)
|
||||
{
|
||||
return finishAfterCount-- <= 0 ? MonitorStatus.DONE : MonitorStatus.CONTINUE;
|
||||
}
|
||||
}
|
||||
|
||||
private static class MockInfiniteMonitor implements Function<Object, MonitorStatus>
|
||||
{
|
||||
@Override
|
||||
public MonitorStatus apply(final Object object)
|
||||
{
|
||||
return MonitorStatus.CONTINUE;
|
||||
}
|
||||
}
|
||||
|
||||
private static class CountingHandler extends BlockingEventHandler<Object>
|
||||
{
|
||||
public int numCompletes = 0;
|
||||
|
||||
public int numFailures = 0;
|
||||
|
||||
public int numTimeouts = 0;
|
||||
|
||||
public CountingHandler(final Object... lockedObjects)
|
||||
{
|
||||
super(lockedObjects);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doBeforeRelease(final MonitorEvent<Object> event)
|
||||
{
|
||||
switch (event.getType())
|
||||
{
|
||||
case COMPLETED:
|
||||
numCompletes++;
|
||||
break;
|
||||
case FAILED:
|
||||
numFailures++;
|
||||
break;
|
||||
case TIMEOUT:
|
||||
numTimeouts++;
|
||||
break;
|
||||
}
|
||||
return MonitorStatus.DONE;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue