Fixed Junit test error
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
index c308b7f..fdc13db 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
@@ -219,13 +219,8 @@
mockOpe.close();
replay(mockOpe);
-<<<<<<< HEAD
swSt.init(dbStore, conf);
- swSt.update(dpid, stateINACTIVE, opUPDATE);
-=======
- swSt.init(conf);
swSt.updateSwitch(dpid, stateINACTIVE, opUPDATE);
->>>>>>> master
}
/**
@@ -257,13 +252,8 @@
mockOpe.close();
replay(mockOpe);
-<<<<<<< HEAD
swSt.init(dbStore, conf);
- swSt.update(dpid, stateINACTIVE, opCREATE);
-=======
- swSt.init(conf);
swSt.updateSwitch(dpid, stateINACTIVE, opCREATE);
->>>>>>> master
}
/**
@@ -295,13 +285,8 @@
mockOpe.close();
replay(mockOpe);
-<<<<<<< HEAD
swSt.init(dbStore, conf);
- swSt.update(dpid, stateINACTIVE, opINSERT);
-=======
- swSt.init(conf);
swSt.updateSwitch(dpid, stateINACTIVE, opINSERT);
->>>>>>> master
}
/**
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
index c76022c..fe51f95 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
@@ -5,11 +5,6 @@
import net.floodlightcontroller.core.internal.TestDatabaseManager;
import net.onrc.onos.graph.GraphDBConnection;
import net.onrc.onos.graph.GraphDBOperation;
-<<<<<<< HEAD
-import net.onrc.onos.ofcontroller.core.ISwitchStorage;
-import net.onrc.onos.ofcontroller.core.ISwitchStorage.SwitchState;
-=======
->>>>>>> master
import net.onrc.onos.ofcontroller.core.INetMapStorage;
import net.onrc.onos.ofcontroller.core.INetMapStorage.DM_OPERATION;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
diff --git a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTest.java
index 4fbf5e1..d017546 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImplTest.java
@@ -71,7 +71,7 @@
// Replace the conf to dummy conf
// String conf = "/tmp/cassandra.titan";
- deviceImpl.init(conf);
+ deviceImpl.init(dbStore, conf);
}