1 files changed, 13 insertions, 13 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
index 7a9080f46db..a6bc7460f2e 100644
--- a/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/test/RankingTestCase.java
@@ -3,10 +3,10 @@ package com.yahoo.search.query.test;
 
 import com.yahoo.search.Query;
 import com.yahoo.search.query.Sorting;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Arne Bergene Fossaa
@@ -17,7 +17,7 @@ public class RankingTestCase {
 
     /** Tests setting rank feature values */
     @Test
-    public void testRankFeatures() {
+    void testRankFeatures() {
         // Check initializing from query
         Query query = new Query("?query=test&ranking.features.query(name)=0.1&ranking.features.fieldMatch(foo)=0.2");
         assertEquals(0.1, query.getRanking().getFeatures().getDouble("query(name)").getAsDouble(), delta);
@@ -30,8 +30,8 @@ public class RankingTestCase {
         assertEquals(0.2, query.getRanking().getFeatures().getDouble("fieldMatch(foo)").getAsDouble(), delta);
 
         // Check programmatic setting + that the clone really has a separate object
-        assertFalse(clone.getRanking().getFeatures() == query.getRanking().getFeatures());
-        clone.properties().set("ranking.features.query(name)","0.3");
+        assertNotNull(query.getRanking().getFeatures());
+        clone.properties().set("ranking.features.query(name)", "0.3");
         assertEquals(0.3, clone.getRanking().getFeatures().getDouble("query(name)").getAsDouble(), delta);
         assertEquals(0.1, query.getRanking().getFeatures().getDouble("query(name)").getAsDouble(), delta);
 
@@ -47,7 +47,7 @@ public class RankingTestCase {
 
     // This test is order dependent. Fix this!!
     @Test
-    public void test_setting_rank_feature_values() {
+    void test_setting_rank_feature_values() {
         // Check initializing from query
         Query query = new Query("?query=test&ranking.properties.foo=bar1&ranking.properties.foo2=bar2&ranking.properties.other=10");
         assertEquals("bar1", query.getRanking().getProperties().get("foo").get(0));
@@ -57,13 +57,13 @@ public class RankingTestCase {
 
         // Test cloning
         Query clone = query.clone();
-        assertFalse(clone.getRanking().getProperties() == query.getRanking().getProperties());
+        assertNotNull(query.getRanking().getProperties());
         assertEquals("bar1", clone.getRanking().getProperties().get("foo").get(0));
         assertEquals("bar2", clone.getRanking().getProperties().get("foo2").get(0));
         assertEquals("10", clone.getRanking().getProperties().get("other").get(0));
 
         // Check programmatic setting mean addition
-        clone.properties().set("ranking.properties.other","12");
+        clone.properties().set("ranking.properties.other", "12");
         assertEquals("[10, 12]", clone.getRanking().getProperties().get("other").toString());
         assertEquals("[10]",     query.getRanking().getProperties().get("other").toString());
 
@@ -74,14 +74,14 @@ public class RankingTestCase {
 
     /** Test setting sorting to null does not cause an exception. */
     @Test
-    public void testResetSorting() {
+    void testResetSorting() {
         Query q = new Query();
-        q.getRanking().setSorting((Sorting)null);
-        q.getRanking().setSorting((String)null);
+        q.getRanking().setSorting((Sorting) null);
+        q.getRanking().setSorting((String) null);
     }
 
     @Test
-    public void testStructuredRankProperty() {
+    void testStructuredRankProperty() {
         Query query = new Query("?query=abc&rankproperty.distanceToPath(gps_position).path=(0,0,10,0,10,5,20,5)");
         assertEquals("(0,0,10,0,10,5,20,5)", query.getRanking().getProperties().get("distanceToPath(gps_position).path").get(0));
     }