Improve LicenseManagerImpl implementation

- Use STAX API for XML processing instead of parsing it manually
- Rearrange code for clarity and testing
- Adjust JUnits accordingly

Issue-ID: APPC-1024
Change-Id: I9d655b581adb401b0c20bc29eda6a2bce1f2ef89
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/test/java/org/onap/appc/licmgr/objects/TestLicenseModel.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/test/java/org/onap/appc/licmgr/objects/TestLicenseModel.java
index bcb862676..9e1d8860f 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/test/java/org/onap/appc/licmgr/objects/TestLicenseModel.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/test/java/org/onap/appc/licmgr/objects/TestLicenseModel.java
@@ -3,7 +3,9 @@
 * ONAP : APPC
 * ================================================================================
 * Copyright 2018 TechMahindra
-*=================================================================================
+* ================================================================================
+* Modifications Copyright (C) 2018 Nokia
+* ================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
@@ -28,19 +30,17 @@ public class TestLicenseModel {
 
     @Before
     public void setUp() {
-        licenseModel = new LicenseModel();
+        licenseModel = new LicenseModel("EntitlementPoolUuid", "LicenseKeyGroupUuid");
     }
 
     @Test
     public void testGetEntitlementPoolUuid() {
-        licenseModel.setEntitlementPoolUuid("EntitlementPoolUuid");
         Assert.assertNotNull(licenseModel.getEntitlementPoolUuid());
         Assert.assertEquals(licenseModel.getEntitlementPoolUuid(), "EntitlementPoolUuid");
     }
 
     @Test
     public void testGetLicenseKeyGroupUuid() {
-        licenseModel.setLicenseKeyGroupUuid("LicenseKeyGroupUuid");
         Assert.assertNotNull(licenseModel.getLicenseKeyGroupUuid());
         Assert.assertEquals(licenseModel.getLicenseKeyGroupUuid(), "LicenseKeyGroupUuid");
     }