From 93fb25deaadd3df511844fdf735c35cff51b4364 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 10 Jan 2020 17:52:57 -0500 Subject: Remove deprecated methods from models Addressed the following issues related to the java 11 upgrade: - forClass().newInstance() - java.xml.bind no longer included in jdk - new mockito doesn't clear captured lists Issue-ID: POLICY-1406 Signed-off-by: Jim Hahn Change-Id: Ia254c1ed21f847d1824e7abc22528975372ee2b6 --- .../onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'models-interactions/model-yaml') diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java index b6b5c7acb..f646712fd 100644 --- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java +++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * policy-yaml unit test * ================================================================================ - * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -341,7 +341,7 @@ public class ControlLoopPolicyBuilderTest { PolicyResult.FAILURE, PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT); - assertTrue(builder.calculateTimeout().equals(new Integer(300 + 600))); + assertEquals(Integer.valueOf(300 + 600), builder.calculateTimeout()); } @Test -- cgit 1.2.3-korg