Skip to content

Commit 0505cdb

Browse files
committed
test: fix unit test broken by commit 6e8e1e3
1 parent 6e8e1e3 commit 0505cdb

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

modules/cells/src/main/java/dmg/cells/nucleus/CellNucleus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import javax.annotation.Nonnull;
5656
import javax.annotation.concurrent.GuardedBy;
5757
import org.apache.curator.framework.CuratorFramework;
58-
import org.apache.curator.framework.imps.CuratorFrameworkImpl;
58+
import org.apache.curator.framework.imps.CuratorFrameworkBase;
5959
import org.apache.curator.framework.imps.PublicDelegatingCuratorFramework;
6060
import org.dcache.util.BoundedCachedExecutor;
6161
import org.dcache.util.BoundedExecutor;
@@ -227,7 +227,7 @@ public CellNucleus(Cell cell, String name, String type, Executor executor) {
227227

228228
CuratorFramework curatorFramework = __cellGlue.getCuratorFramework();
229229
// Per-cell nucleaus curator with CDC
230-
_curatorFramework = new PublicDelegatingCuratorFramework((CuratorFrameworkImpl) curatorFramework) {
230+
_curatorFramework = new PublicDelegatingCuratorFramework((CuratorFrameworkBase) curatorFramework) {
231231

232232
private final Executor sequentialExecutor = new SequentialExecutor(_messageExecutor) {
233233
@Override

modules/cells/src/main/java/org/apache/curator/framework/imps/PublicDelegatingCuratorFramework.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public abstract class PublicDelegatingCuratorFramework extends DelegatingCuratorFramework {
44

5-
public PublicDelegatingCuratorFramework(CuratorFrameworkImpl delegate) {
5+
public PublicDelegatingCuratorFramework(CuratorFrameworkBase delegate) {
66
super(delegate);
77
}
88
}

modules/dcache/src/test/java/org/dcache/boot/DomainConfigurationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.util.Optional;
1515
import java.util.Properties;
1616
import org.apache.curator.framework.CuratorFramework;
17+
import org.apache.curator.framework.imps.CuratorFrameworkBase;
1718
import org.apache.curator.framework.listen.Listenable;
1819
import org.dcache.util.configuration.ConfigurationProperties;
1920
import org.junit.Before;
@@ -49,7 +50,7 @@ public class DomainConfigurationTest {
4950
private final static SystemCell system;
5051

5152
static {
52-
CuratorFramework mockCurator = Mockito.mock(CuratorFramework.class);
53+
CuratorFramework mockCurator = Mockito.mock(CuratorFrameworkBase.class);
5354
Mockito.when(mockCurator.getConnectionStateListenable())
5455
.thenReturn(Mockito.mock(Listenable.class));
5556
Mockito.when(mockCurator.getCuratorListenable())

0 commit comments

Comments
 (0)