X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FAbstractMockedModule.java;h=837ae2b3c86d7ee977648407b142f50dec17c76e;hb=6ad5abbd24e3c0369df81955ba099135c782d1d3;hp=87d6e8b698e6d44795e0850380a15f4924bbf72e;hpb=0641db636be750bf98e85c702c4948c7c835b9b6;p=controller.git diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java index 87d6e8b698..837ae2b3c8 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java @@ -14,15 +14,21 @@ import org.opendaylight.controller.config.spi.Module; public abstract class AbstractMockedModule implements Module { protected final AutoCloseable instance; - - public AbstractMockedModule() throws Exception { - instance = prepareMockedInstance(); - } + private final ModuleIdentifier id; protected abstract AutoCloseable prepareMockedInstance() throws Exception; - public AbstractMockedModule(DynamicMBeanWithInstance old) { - instance = old.getInstance(); + public AbstractMockedModule(DynamicMBeanWithInstance old, ModuleIdentifier id) { + if(old!=null) + instance = old.getInstance(); + else + try { + instance = prepareMockedInstance(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + this.id = id==null ? new ModuleIdentifier(getClass().getCanonicalName(), "mock") : id; } @Override @@ -34,5 +40,9 @@ public abstract class AbstractMockedModule implements Module { return instance; } + @Override + public ModuleIdentifier getIdentifier() { + return id; + } }