Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 2267: Reuse leaf and leaf set entry builders in NormalizedNodeInputStreamR...
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
testingservices
/
parallelapsp
/
test
/
MockedDependenciesTest.java
diff --git
a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
index 29e91fd924b5739af4b155e7e84b90a0c043a336..7deade5de25b79d97cbf79b4c0635e8cc3b97f6c 100644
(file)
--- a/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
+++ b/
opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java
@@
-10,9
+10,7
@@
package org.opendaylight.controller.config.manager.testingservices.parallelapsp.
import java.io.Closeable;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.io.Closeable;
import java.io.IOException;
import java.util.concurrent.Executor;
-
import javax.management.ObjectName;
import javax.management.ObjectName;
-
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.config.api.DynamicMBeanWithInstance;
@@
-36,7
+34,7
@@
public class MockedDependenciesTest extends AbstractParallelAPSPTest {
ClassBasedModuleFactory mockedThreadPoolConfigFactory = new ClassBasedModuleFactory(
threadPoolImplementationName, MockedThreadPoolModule.class);
ClassBasedModuleFactory mockedThreadPoolConfigFactory = new ClassBasedModuleFactory(
threadPoolImplementationName, MockedThreadPoolModule.class);
- super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(
+ super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(
mockedContext,
new TestingParallelAPSPModuleFactory(),
mockedThreadPoolConfigFactory));
}
new TestingParallelAPSPModuleFactory(),
mockedThreadPoolConfigFactory));
}
@@
-60,11
+58,6
@@
public class MockedDependenciesTest extends AbstractParallelAPSPTest {
this.moduleIdentifier = moduleIdentifier;
}
this.moduleIdentifier = moduleIdentifier;
}
- @Override
- public ModuleIdentifier getName() {
- return moduleIdentifier;
- }
-
@Override
public int getThreadCount() {
return threadCount;
@Override
public int getThreadCount() {
return threadCount;
@@
-84,6
+77,11
@@
public class MockedDependenciesTest extends AbstractParallelAPSPTest {
public Closeable getInstance() {
return new MockedThreadPool(threadCount);
}
public Closeable getInstance() {
return new MockedThreadPool(threadCount);
}
+
+ @Override
+ public ModuleIdentifier getIdentifier() {
+ return moduleIdentifier;
+ }
}
public static class MockedThreadPool implements TestingThreadPoolIfc,
}
public static class MockedThreadPool implements TestingThreadPoolIfc,
@@
-111,7
+109,7
@@
public class MockedDependenciesTest extends AbstractParallelAPSPTest {
}
@Override
}
@Override
- String getThreadPoolImplementationName() {
+
protected
String getThreadPoolImplementationName() {
return threadPoolImplementationName;
}
return threadPoolImplementationName;
}