diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-02-12 08:03:49 -0500 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2021-02-12 08:51:15 -0500 |
| commit | 757a65fe95f5f203545085ea63f659a817dad260 (patch) | |
| tree | 6443b561827180e2705eb3d6a4f6f970f84d039c /feature-distributed-locking/src/test/java/org/onap | |
| parent | 26374a9c185b29d85b12611735469e8543415031 (diff) | |
Fix sonars from dependency upgrade
The dependency upgrades in policy-parent caused some new sonars. In
particular, initMocks() has been deprecated - replaced with calls to the
Mockito Runner. Changed one to openMocks() because using the Runner
caused it to fail on jenkins, but not in the local eclipse.
Also fixed a type safety issue with EMPTY_LIST.
Issue-ID: POLICY-2909
Change-Id: Iea9420190f208d7de3bf3ad531515c92e0fab83f
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-distributed-locking/src/test/java/org/onap')
| -rw-r--r-- | feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockManagerTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockManagerTest.java b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockManagerTest.java index 0c0dbf11..d36fbe1f 100644 --- a/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockManagerTest.java +++ b/feature-distributed-locking/src/test/java/org/onap/policy/distributed/locking/DistributedLockManagerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,10 +70,11 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; import org.kie.api.runtime.KieSession; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.common.utils.services.OrderedServiceImpl; import org.onap.policy.distributed.locking.DistributedLockManager.DistributedLock; import org.onap.policy.drools.core.PolicySession; @@ -86,6 +87,7 @@ import org.onap.policy.drools.system.PolicyEngine; import org.onap.policy.drools.system.PolicyEngineConstants; import org.powermock.reflect.Whitebox; +@RunWith(MockitoJUnitRunner.class) public class DistributedLockManagerTest { private static final long EXPIRE_SEC = 900L; private static final long RETRY_SEC = 60L; @@ -186,8 +188,6 @@ public class DistributedLockManagerTest { */ @Before public void setUp() throws SQLException { - MockitoAnnotations.initMocks(this); - // grant() and deny() calls will come through here and be immediately executed session = new PolicySession(null, null, kieSess) { @Override |