Updated the repo to support JDK 17

[holmes/common.git] / holmes-actions / src / test / java / org / onap / holmes / common / engine / service / impl / EngineEntityServiceImplTest.java

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
index 21a4025..3687299 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/engine/service/impl/EngineEntityServiceImplTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 ZTE Corporation.
+ * Copyright 2020 - 2023 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,21 @@
 
 package org.onap.holmes.common.engine.service.impl;
 
-import com.google.common.base.CharMatcher;
-import org.junit.Before;
+import org.jdbi.v3.core.Jdbi;
 import org.junit.Test;
 import org.onap.holmes.common.engine.dao.EngineEntityDao;
 import org.onap.holmes.common.engine.entity.EngineEntity;
 import org.onap.holmes.common.engine.service.EngineEntityService;
-import org.onap.holmes.common.utils.DbDaoUtil;
+import org.onap.holmes.common.database.DbDaoUtil;
 
 import java.util.*;
 
-import static com.google.common.base.Predicates.notNull;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.junit.Assert.*;
 
 public class EngineEntityServiceImplTest {
-    private EngineEntityService service = new EngineEntityServiceImpl(new DbDaoUtilStub());
+    private EngineEntityService service = new EngineEntityServiceImpl(new DbDaoUtilStub(null));
 
     @Test
     public void getLegacyEngines() {
@@ -78,6 +76,10 @@ public class EngineEntityServiceImplTest {
 class DbDaoUtilStub extends DbDaoUtil {
     private EngineEntityDao dao = new EngineEntityDaoStub();
 
+    public DbDaoUtilStub(Jdbi jdbi) {
+        super(jdbi);
+    }
+
     @Override
     public <T> T getJdbiDaoByOnDemand(Class<T> daoClazz) {
 
@@ -116,6 +118,7 @@ class EngineEntityDaoStub implements EngineEntityDao {
 
     @Override
     public void updateEntity(EngineEntity entity) {
+        entitySet.remove(entity);
         entitySet.add(entity);
     }