Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify method isMutualExclusive in Subnet.
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-connector
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
sal
/
restconf
/
impl
/
test
/
ToJsonChoiceCaseTest.java
diff --git
a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ToJsonChoiceCaseTest.java
b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ToJsonChoiceCaseTest.java
index 8e3ff1d2ed4a998997181a897a1c8ff648099aaa..c5682cb5cc1381eb31c66716a06118aa2e557e48 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ToJsonChoiceCaseTest.java
+++ b/
opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/ToJsonChoiceCaseTest.java
@@
-1,27
+1,18
@@
package org.opendaylight.controller.sal.restconf.impl.test;
package org.opendaylight.controller.sal.restconf.impl.test;
-import static org.junit.Assert.
*
;
+import static org.junit.Assert.
assertTrue
;
import java.io.IOException;
import java.io.IOException;
-import java.util.Set;
-import javax.activation.UnsupportedDataTypeException;
import javax.ws.rs.WebApplicationException;
import org.junit.*;
import javax.ws.rs.WebApplicationException;
import org.junit.*;
-import org.opendaylight.yangtools.yang.model.api.*;
-public class ToJsonChoiceCaseTest {
-
- private static Set<Module> modules;
- private static DataSchemaNode dataSchemaNode;
+public class ToJsonChoiceCaseTest extends YangAndXmlAndDataSchemaLoader {
@BeforeClass
public static void initialization() {
@BeforeClass
public static void initialization() {
- modules = TestUtils.resolveModules("/yang-to-json-conversion/choice");
- Module module = TestUtils.resolveModule(null, modules);
- dataSchemaNode = TestUtils.resolveDataSchemaNode(module, null);
-
+ dataLoad("/yang-to-json-conversion/choice");
}
/**
}
/**
@@
-44,9
+35,9
@@
public class ToJsonChoiceCaseTest {
/**
* Test when some data are in one case node and other in another.
/**
* Test when some data are in one case node and other in another.
- * Additionally data are loadef from various choices. This isn't
- *
correct. Next Json validator should return error because nodes has to b
e
- *
from one
case below concrete choice.
+ * Additionally data are loadef from various choices. This isn't
correct.
+ *
Next Json validator should return error because nodes has to be from on
e
+ * case below concrete choice.
*
*/
@Test
*
*/
@Test