Fix buck tests
Change-Id: I3d681e6e5c1d3e98c87ccb3d20a619b216ae6133
diff --git a/core/api/BUCK b/core/api/BUCK
index f4d5eb7..2ba9801 100644
--- a/core/api/BUCK
+++ b/core/api/BUCK
@@ -18,8 +18,6 @@
name = CURRENT_NAME,
srcs = glob([SRC + '/*.java']),
deps = COMPILE_DEPS,
- resources_root = 'src/test/resources',
- resources = glob(['src/test/resources/**']),
visibility = ['PUBLIC'],
)
@@ -31,4 +29,6 @@
TEST_DEPS +
[CURRENT_TARGET],
source_under_test = [CURRENT_TARGET],
+ resources_root = 'src/test/resources',
+ resources = glob(['src/test/resources/**']),
)
diff --git a/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java b/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
index 5e84cd8..433a201 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
@@ -23,6 +23,14 @@
* Mock id generator for testing.
*/
public class MockIdGenerator implements IdGenerator {
+
+ private static boolean generatorIsBound = false;
+ public static void bindNewGenerator() {
+ if (!generatorIsBound) {
+ generatorIsBound = true;
+ Intent.bindIdGenerator(new MockIdGenerator());
+ }
+ }
private AtomicLong nextId = new AtomicLong(0);
@Override
diff --git a/core/net/BUCK b/core/net/BUCK
index 07139f9..bffb300 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -9,7 +9,10 @@
]
TEST_DEPS = [
- '//lib:TEST',
+ '//lib:TEST_ADAPTERS',
+ '//core/common:onos-core-common',
+ '//core/store/dist:onos-core-dist',
+ '//core/store/dist:onos-core-dist-tests',
]
osgi_jar(
@@ -26,4 +29,6 @@
TEST_DEPS +
[CURRENT_TARGET],
source_under_test = [CURRENT_TARGET],
+ resources_root = 'src/test/resources',
+ resources = glob(['src/test/resources/**']),
)
diff --git a/core/store/dist/BUCK b/core/store/dist/BUCK
index c9bd95c..6c56b3f 100644
--- a/core/store/dist/BUCK
+++ b/core/store/dist/BUCK
@@ -30,10 +30,11 @@
)
java_test(
- name= 'tests',
+ name= 'onos-core-dist-tests',
srcs = glob([TEST + '/*.java']),
deps = COMPILE_DEPS +
TEST_DEPS +
[CURRENT_TARGET],
source_under_test = [CURRENT_TARGET],
+ visibility = ['PUBLIC'],
)