Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert DatastoreSnapshotRestore to OSGi DS
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DatastoreSnapshotRestoreTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java
index 4cd7290498eeefc7d4a1123162f0120056129d09..5cefc8b36d76b91dc4c3731cda8be398374ddfa5 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestoreTest.java
@@
-17,6
+17,7
@@
import java.io.File;
import java.io.FileOutputStream;
import java.util.Arrays;
import java.util.Collections;
import java.io.FileOutputStream;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Optional;
import org.apache.commons.lang3.SerializationUtils;
import org.junit.After;
import org.junit.Test;
import org.apache.commons.lang3.SerializationUtils;
import org.junit.After;
import org.junit.Test;
@@
-77,18
+78,15
@@
public class DatastoreSnapshotRestoreTest {
SerializationUtils.serialize(snapshotList, fos);
}
SerializationUtils.serialize(snapshotList, fos);
}
- DatastoreSnapshotRestore instance = DatastoreSnapshotRestore.instance(restoreDirectoryPath);
+ DefaultDatastoreSnapshotRestore instance = new DefaultDatastoreSnapshotRestore(restoreDirectoryPath);
+ instance.activate();
- assertDatastoreSnapshotEquals(configSnapshot, instance.getAndRemove("config"));
- assertDatastoreSnapshotEquals(operSnapshot, instance.getAndRemove("oper"));
+ assertDatastoreSnapshotEquals(configSnapshot, instance.getAndRemove("config")
.orElse(null)
);
+ assertDatastoreSnapshotEquals(operSnapshot, instance.getAndRemove("oper")
.orElse(null)
);
- assert
Null("DatastoreSnapshot was not removed"
, instance.getAndRemove("config"));
+ assert
Equals("DatastoreSnapshot was not removed", Optional.empty()
, instance.getAndRemove("config"));
assertFalse(backupFile + " was not deleted", backupFile.exists());
assertFalse(backupFile + " was not deleted", backupFile.exists());
-
- instance = DatastoreSnapshotRestore.instance(restoreDirectoryPath);
- assertNull("Expected null DatastoreSnapshot", instance.getAndRemove("config"));
- assertNull("Expected null DatastoreSnapshot", instance.getAndRemove("oper"));
}
private static void assertDatastoreSnapshotEquals(final DatastoreSnapshot expected,
}
private static void assertDatastoreSnapshotEquals(final DatastoreSnapshot expected,