From 2fa29d8632a6dc9fb855a732320b679d724f384f Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 9 Jan 2019 15:39:46 -0500 Subject: Remove policy/common integrity-audit suppressions Changed "DbDAO" to "DbDao". Change-Id: I51a6706cceef6857404ae7c12ce43e553ea0da29 Issue-ID: POLICY-1133 Signed-off-by: Jim Hahn --- .../common/ia/DbAuditCompareEntriesTest.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditCompareEntriesTest.java') diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditCompareEntriesTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditCompareEntriesTest.java index 6335482a..a5d0ef1b 100644 --- a/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditCompareEntriesTest.java +++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/DbAuditCompareEntriesTest.java @@ -1,8 +1,8 @@ -/*- +/* * ============LICENSE_START======================================================= * Integrity Audit * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 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. @@ -52,7 +52,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { private static Logger logger = FlexLogger.getLogger(DbAuditCompareEntriesTest.class); - private DbDAO dbDao; + private DbDao dbDao; private static String resourceName = "pdp1"; @BeforeClass @@ -105,7 +105,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { public void testSuccessfulComparison() throws Exception { logger.info("testSuccessfulComparison: Entering"); - dbDao = new DbDAO(resourceName, A_SEQ_PU, makeProperties()); + dbDao = new DbDao(resourceName, A_SEQ_PU, makeProperties()); final DbAudit dbAudit = new DbAudit(dbDao); String className = null; @@ -175,7 +175,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { public void testComparisonError() throws Exception { logger.info("testComparisonError: Entering"); - dbDao = new DbDAO(resourceName, A_SEQ_PU, makeProperties()); + dbDao = new DbDao(resourceName, A_SEQ_PU, makeProperties()); final DbAudit dbAudit = new DbAudit(dbDao); final String resourceName1 = resourceName; @@ -235,7 +235,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { public void testCompareMissingEntries() throws Exception { logger.info("testCompareMissingEntries: Entering"); - dbDao = new DbDAO(resourceName, A_SEQ_PU, makeProperties()); + dbDao = new DbDao(resourceName, A_SEQ_PU, makeProperties()); final DbAudit dbAudit = new DbAudit(dbDao); final String resourceName1 = resourceName; @@ -321,7 +321,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { public void testCompareAllHashEntities() throws Exception { logger.info("testCompareAllHashEntities: Entering"); - dbDao = new DbDAO(resourceName, A_SEQ_PU, makeProperties()); + dbDao = new DbDao(resourceName, A_SEQ_PU, makeProperties()); DbAudit dbAudit = new DbAudit(dbDao); Set classNameSet = dbDao.getPersistenceClassNames(); @@ -442,13 +442,13 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { truncateTables(properties2); // Add entries into DB1 - dbDao = new DbDAO(resourceName, A_SEQ_PU, properties); - new DbDAO("pdp2", A_SEQ_PU, properties).destroy(); + dbDao = new DbDao(resourceName, A_SEQ_PU, properties); + new DbDao("pdp2", A_SEQ_PU, properties).destroy(); DbAudit dbAudit = new DbAudit(dbDao); // Add entries into DB2 - DbDAO dbDao3 = new DbDAO(resourceName, A_SEQ_PU, properties2); - new DbDAO("pdp2", A_SEQ_PU, properties2).destroy(); + DbDao dbDao3 = new DbDao(resourceName, A_SEQ_PU, properties2); + new DbDao("pdp2", A_SEQ_PU, properties2).destroy(); // Pull all entries and compare Set classNameSet = dbDao.getPersistenceClassNames(); @@ -491,7 +491,7 @@ public class DbAuditCompareEntriesTest extends IntegrityAuditTestBase { public void testEmbeddedClass() throws Exception { logger.info("testEmbeddedClasses: Entering"); - dbDao = new DbDAO(resourceName, A_SEQ_PU, properties); + dbDao = new DbDao(resourceName, A_SEQ_PU, properties); final DbAudit dbAudit = new DbAudit(dbDao); String className = null; -- cgit 1.2.3-korg