From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../org/onap/vid/aai/util/CacheConfigTest.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 vid-app-common/src/test/java/org/onap/vid/aai/util/CacheConfigTest.java (limited to 'vid-app-common/src/test/java/org/onap/vid/aai/util/CacheConfigTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/util/CacheConfigTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/util/CacheConfigTest.java new file mode 100644 index 000000000..1faaee3aa --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/aai/util/CacheConfigTest.java @@ -0,0 +1,32 @@ +package org.onap.vid.aai.util; + +import org.testng.annotations.Test; + +import static org.testng.AssertJUnit.assertEquals; + +public class CacheConfigTest { + + @Test + public void whenDeserializeJson_ValuesReadAsExpected() { + CacheConfigProvider cacheConfigProvider = new CacheConfigProviderImpl(); + CacheConfig cacheConfigA = cacheConfigProvider.getCacheConfig("a"); + assertEquals(true, cacheConfigA.isActive()); + assertEquals(6L, cacheConfigA.getExpireAfterWriteHours()); + assertEquals(9L, cacheConfigA.getRefreshAfterWriteSeconds()); + + //entry exist in configuration, but with no values + CacheConfig cacheConfigB = cacheConfigProvider.getCacheConfig("b"); + assertEquals(cacheConfigB.isActive(), CacheConfig.Companion.getDefaultCacheConfig().isActive()); + assertEquals(cacheConfigB.getExpireAfterWriteHours(), CacheConfig.Companion.getDefaultCacheConfig().getExpireAfterWriteHours()); + assertEquals(cacheConfigB.getRefreshAfterWriteSeconds(), CacheConfig.Companion.getDefaultCacheConfig().getRefreshAfterWriteSeconds()); + + + //entry doesn't exist in configuration + CacheConfig cacheConfigC = cacheConfigProvider.getCacheConfig("c"); + assertEquals(CacheConfig.Companion.getDefaultCacheConfig(), cacheConfigC); + + CacheConfig cacheConfigD = cacheConfigProvider.getCacheConfig("d"); + assertEquals(false, cacheConfigD.isActive()); + + } +} -- cgit 1.2.3-korg