Merge "Removed MsoLogger from UUIDChecker"

1 files changed, 3 insertions, 23 deletions

diff --git a/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java b/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
index b4058a7ba8..9c9f58710e 100644
--- a/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
+++ b/common/src/test/java/org/onap/so/utils/UUIDCheckerTest.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -23,11 +25,9 @@ package org.onap.so.utils;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.onap.so.logger.MsoLogger;
 
 public class UUIDCheckerTest {
-	private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL, UUIDCheckerTest.class);
-	
+
 	@Test
 	public void isValidUUIDTest(){
 		String nullID = null;
@@ -37,24 +37,4 @@ public class UUIDCheckerTest {
 		assertFalse(UUIDChecker.isValidUUID(badID));
 		assertTrue(UUIDChecker.isValidUUID(id));
 	}
-
-	@Test
-	public void verifyOldUUIDTest(){
-		String oldID = UUIDChecker.getUUID();
-		String invalidID = "This is not a UUID";
-		assertEquals(UUIDChecker.verifyOldUUID(oldID,LOGGER),oldID);
-		assertNotEquals(UUIDChecker.verifyOldUUID(invalidID,LOGGER),invalidID);
-	}
-	
-	@Test
-	public void generateTest(){
-		String id = UUIDChecker.generateUUID(LOGGER);
-		assertNotNull(id);
-		assertTrue(UUIDChecker.isValidUUID(id));
-		
-		id = UUIDChecker.generateServiceInstanceID(LOGGER);
-		assertNotNull(id);
-		assertTrue(UUIDChecker.isValidUUID(id));
-		
-	}
 }