1 files changed, 36 insertions, 36 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java b/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
index 6c73937f4fa..4badb16f20c 100644
--- a/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
+++ b/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
@@ -4,9 +4,9 @@ package com.yahoo.search.query;
 import com.yahoo.prelude.query.NotItem;
 import com.yahoo.prelude.query.NullItem;
 import com.yahoo.prelude.query.WordItem;
-import org.junit.Assert;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -14,53 +14,53 @@ import static org.junit.Assert.assertEquals;
 public class QueryTreeTest {
 
     @Test
-    public void testAddQueryItemWithRoot() {
-        Assert.assertEquals("AND a b",
-                            new QueryTree(new WordItem("a")).and(new WordItem("b")).toString());
+    void testAddQueryItemWithRoot() {
+        assertEquals("AND a b",
+                new QueryTree(new WordItem("a")).and(new WordItem("b")).toString());
 
         NotItem not = new NotItem();
         not.addNegativeItem(new WordItem("b"));
         assertEquals("+a -b",
-                     new QueryTree(new WordItem("a")).and(not).toString());
-     }
+                new QueryTree(new WordItem("a")).and(not).toString());
+    }
 
-     @Test
-     public void addNotToNot() {
-         NotItem not1 = new NotItem();
-         not1.addPositiveItem(new WordItem("p1"));
-         not1.addNegativeItem(new WordItem("n1.1"));
-         not1.addNegativeItem(new WordItem("n1.2"));
+    @Test
+    void addNotToNot() {
+        NotItem not1 = new NotItem();
+        not1.addPositiveItem(new WordItem("p1"));
+        not1.addNegativeItem(new WordItem("n1.1"));
+        not1.addNegativeItem(new WordItem("n1.2"));
 
-         NotItem not2 = new NotItem();
-         not2.addPositiveItem(new WordItem("p2"));
-         not2.addNegativeItem(new WordItem("n2.1"));
-         not2.addNegativeItem(new WordItem("n2.2"));
+        NotItem not2 = new NotItem();
+        not2.addPositiveItem(new WordItem("p2"));
+        not2.addNegativeItem(new WordItem("n2.1"));
+        not2.addNegativeItem(new WordItem("n2.2"));
 
-         QueryTree tree = new QueryTree(not1);
-         tree.and(not2);
+        QueryTree tree = new QueryTree(not1);
+        tree.and(not2);
 
-         assertEquals("+(AND p1 p2) -n1.1 -n1.2 -n2.1 -n2.2", tree.toString());
-     }
+        assertEquals("+(AND p1 p2) -n1.1 -n1.2 -n2.1 -n2.2", tree.toString());
+    }
 
-     @Test
-     public void getCorrectTreeSize() {
+    @Test
+    void getCorrectTreeSize() {
         QueryTree nullTree = new QueryTree(new NullItem());
         assertEquals(0, nullTree.treeSize());
 
-         NotItem not1 = new NotItem();
-         not1.addPositiveItem(new WordItem("p1"));
-         not1.addNegativeItem(new WordItem("n1.1"));
-         not1.addNegativeItem(new WordItem("n1.2"));
+        NotItem not1 = new NotItem();
+        not1.addPositiveItem(new WordItem("p1"));
+        not1.addNegativeItem(new WordItem("n1.1"));
+        not1.addNegativeItem(new WordItem("n1.2"));
 
-         NotItem not2 = new NotItem();
-         not2.addPositiveItem(new WordItem("p2"));
-         not2.addNegativeItem(new WordItem("n2.1"));
-         not2.addNegativeItem(new WordItem("n2.2"));
+        NotItem not2 = new NotItem();
+        not2.addPositiveItem(new WordItem("p2"));
+        not2.addNegativeItem(new WordItem("n2.1"));
+        not2.addNegativeItem(new WordItem("n2.2"));
 
-         QueryTree tree = new QueryTree(not1);
-         tree.and(not2);
+        QueryTree tree = new QueryTree(not1);
+        tree.and(not2);
 
-         assertEquals(8, tree.treeSize());
-     }
+        assertEquals(8, tree.treeSize());
+    }
 
 }