Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from real-logic:master #2228

Merged
merged 1 commit into from
Dec 17, 2024
Merged

[pull] master from real-logic:master #2228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions aeron-cluster/src/test/java/io/aeron/cluster/ConsensusModuleContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,7 @@ void beforeEach()
final Aeron aeron = mock(Aeron.class);
when(aeron.addCounter(
anyInt(), any(DirectBuffer.class), anyInt(), anyInt(), any(DirectBuffer.class), anyInt(), anyInt()))
.thenAnswer(invocation ->
{
final int counterId = countersManager.allocate(
invocation.getArgument(0),
invocation.getArgument(1),
invocation.getArgument(2),
invocation.getArgument(3),
invocation.getArgument(4),
invocation.getArgument(5),
invocation.getArgument(6));
return new Counter(countersManager, registrationId++, counterId);
});
.thenAnswer(Tests.addCounterAnswer(countersManager, () -> registrationId++));
when(aeron.context()).thenReturn(aeronContext);
when(aeron.conductorAgentInvoker()).thenReturn(conductorInvoker);
when(aeron.countersReader()).thenReturn(countersManager);
Expand Down
24 changes: 24 additions & 0 deletions aeron-test-support/src/main/java/io/aeron/test/Tests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.aeron.test;

import io.aeron.Aeron;
import io.aeron.Counter;
import io.aeron.Publication;
import io.aeron.Subscription;
import io.aeron.archive.status.RecordingPos;
Expand All @@ -25,6 +26,7 @@
import io.aeron.exceptions.RegistrationException;
import io.aeron.exceptions.TimeoutException;

import org.agrona.DirectBuffer;
import org.agrona.LangUtil;
import org.agrona.concurrent.IdleStrategy;
import org.agrona.concurrent.SleepingMillisIdleStrategy;
Expand All @@ -35,6 +37,7 @@
import org.agrona.concurrent.status.CountersReader;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.TestWatcher;
import org.mockito.stubbing.Answer;

import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
Expand Down Expand Up @@ -832,6 +835,27 @@ public static CountersManager newCountersManager(final int dataLength)
new UnsafeBuffer(ByteBuffer.allocateDirect(dataLength)));
}

public static Answer<Counter> addCounterAnswer(
final CountersManager countersManager,
final LongSupplier registrationId)
{
return invocation ->
{
final int counterType = invocation.getArgument(0, Integer.class);
final DirectBuffer keyBuffer = invocation.getArgument(1, DirectBuffer.class);
final int keyOffset = invocation.getArgument(2, Integer.class);
final int keyLength = invocation.getArgument(3, Integer.class);
final DirectBuffer labelBuffer = invocation.getArgument(4, DirectBuffer.class);
final int labelOffset = invocation.getArgument(5, Integer.class);
final int labelLength = invocation.getArgument(6, Integer.class);

final int allocate = countersManager.allocate(
counterType, keyBuffer, keyOffset, keyLength, labelBuffer, labelOffset, labelLength);

return new Counter(countersManager, registrationId.getAsLong(), allocate);
};
}

public static Throwable setOrUpdateError(final Throwable existingError, final Throwable newError)
{
if (null == existingError)
Expand Down
Loading