Revert "Unify ORv1 and IIv5"

[yangtools.git] / common / yang-common / src / test / java / org / opendaylight / yangtools / yang / common / EmptyTest.java

diff --git a/common/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/EmptyTest.java b/common/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/EmptyTest.java
index 4df61f90e6b388d74848d34c99021834429a6729..7c1f9a3e9ea14b234d98c288b292123f2579f971 100644 (file)
--- a/common/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/EmptyTest.java
+++ b/common/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/EmptyTest.java
@@ -7,34 +7,34 @@
  */
 package org.opendaylight.yangtools.yang.common;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class EmptyTest {
 
     @Test
     public void testInstanceNotNull() {
-        assertNotNull(Empty.getInstance());
+        assertNotNull(Empty.value());
     }
 
     @Test
     public void testToString() {
-        assertEquals("empty", Empty.getInstance().toString());
+        assertEquals("empty", Empty.value().toString());
     }
 
     @Test
     public void testSerialization() throws IOException, ClassNotFoundException {
         final ByteArrayOutputStream bos = new ByteArrayOutputStream();
         try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
-            oos.writeObject(Empty.getInstance());
+            oos.writeObject(Empty.value());
         }
 
         final Object read;
@@ -42,6 +42,6 @@ public class EmptyTest {
             read = ois.readObject();
         }
 
-        assertSame(Empty.getInstance(), read);
+        assertSame(Empty.value(), read);
     }
 }