Enable buck rabbit MQ app unit tests
Change-Id: I03aa0047c9543457d718f2f82bf316ba6f209e7f
diff --git a/apps/rabbitmq/BUCK b/apps/rabbitmq/BUCK
index 3a2fa87..a1f5135 100644
--- a/apps/rabbitmq/BUCK
+++ b/apps/rabbitmq/BUCK
@@ -6,14 +6,21 @@
'//lib:amqp-client',
]
+TEST_DEPS = [
+ '//lib:TEST_ADAPTERS',
+]
+
BUNDLES = [
'//lib:gson',
'//lib:amqp-client',
'//apps/rabbitmq:onos-apps-rabbitmq',
]
-osgi_jar (
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
+ test_deps = TEST_DEPS,
+ resources_root = 'src/main/resources',
+ resources = glob(['src/main/resources/**']),
)
onos_app (
diff --git a/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java b/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
index 33aded4..f5f649b 100644
--- a/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
+++ b/apps/rabbitmq/src/main/java/org/onosproject/rabbitmq/util/MQUtil.java
@@ -15,10 +15,8 @@
*/
package org.onosproject.rabbitmq.util;
-import java.io.File;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Date;
@@ -208,27 +206,21 @@
* @throws RuntimeException if property file not found.
*/
public static Properties getProp(ComponentContext context) {
+ InputStream is;
URL configUrl;
try {
configUrl = context.getBundleContext().getBundle()
.getResource(MQ_PROP_NAME);
+ is = configUrl.openStream();
} catch (Exception ex) {
// This will be used only during junit test case since bundle
// context will be available during runtime only.
- File file = new File(
- MQUtil.class.getClassLoader().getResource(MQ_PROP_NAME)
- .getFile());
- try {
- configUrl = file.toURL();
- } catch (MalformedURLException e) {
- log.error(ExceptionUtils.getFullStackTrace(e));
- throw new RuntimeException(e);
- }
+ // FIXME - this should be configured with component config when running as a test
+ is = MQUtil.class.getClassLoader().getResourceAsStream(MQ_PROP_NAME);
}
Properties properties;
try {
- InputStream is = configUrl.openStream();
properties = new Properties();
properties.load(is);
} catch (Exception e) {
diff --git a/apps/rabbitmq/src/test/java/org/onosproject/rabbitmq/listener/MQEventHandlerTest.java b/apps/rabbitmq/src/test/java/org/onosproject/rabbitmq/listener/MQEventHandlerTest.java
index c903c4b..d8a2b8f 100644
--- a/apps/rabbitmq/src/test/java/org/onosproject/rabbitmq/listener/MQEventHandlerTest.java
+++ b/apps/rabbitmq/src/test/java/org/onosproject/rabbitmq/listener/MQEventHandlerTest.java
@@ -45,6 +45,7 @@
import org.junit.runner.RunWith;
import org.onlab.packet.ChassisId;
import org.onlab.packet.Ethernet;
+import org.onlab.packet.MacAddress;
import org.onlab.packet.ONOSLLDP;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
@@ -333,7 +334,7 @@
Ethernet ethPacket = new Ethernet();
ethPacket.setEtherType(Ethernet.TYPE_LLDP);
- ethPacket.setDestinationMACAddress(ONOSLLDP.LLDP_ONLAB);
+ ethPacket.setDestinationMACAddress(MacAddress.ONOS_LLDP);
ethPacket.setPayload(lldp);
ethPacket.setPad(true);