1 files changed, 106 insertions, 106 deletions
diff --git a/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
index 6c88494..0067377 100644
--- a/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
+++ b/sdc-tosca/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
@@ -7,9 +7,9 @@
  * 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
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,121 +20,121 @@
 
 package org.onap.sdc.impl;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes;
 
+@ExtendWith({SdcToscaParserBasicTest.class})
+class ToscaParserErrorHandlingTest extends SdcToscaParserBasicTest {
 
+    @Test
+    public void testMissingMetadata() {
+        String csarPath = "csars/service-missing-meta-file.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        File file = new File(fileLocationString);
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
 
-public class ToscaParserErrorHandlingTest extends SdcToscaParserBasicTest {
-	
-	
-	@Test
-	public void testMissingMetadata(){
-		String csarPath = "csars/service-missing-meta-file.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+    @Test
+    public void testInvalidYamlContentMeta() {
+        String csarPath = "csars/service-invalid-yaml-content-meta.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-	
-	
-	@Test
-	public void testInvalidYamlContentMeta(){
-		String csarPath = "csars/service-invalid-yaml-content-meta.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
+
+    @Test
+    public void testEntryDefinitionNotDefined() {
+        String csarPath = "csars/service-entry-definition-not-defined.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-	
-	@Test
-	public void testEntryDefinitionNotDefined(){
-		String csarPath = "csars/service-entry-definition-not-defined.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
+
+    @Test
+    public void testMissingEntryDefinitionFile() {
+        String csarPath = "csars/service-missing-entry-definition.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-
-	@Test
-	public void testMissingEntryDefinitionFile(){
-		String csarPath = "csars/service-missing-entry-definition.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
+
+    //@Test - PA - there are currently no critical erros in JTosca
+    public void tesValidationError() {
+        String csarPath = "csars/service-invalid-input-args.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        File file = new File(fileLocationString);
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
+
+    @Test
+    public void testInValidMinConformanceLevelError() {
+        String csarPath = "csars/service-invalid-conformence-level.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-	
-	//@Test - PA - there are currently no critical erros in JTosca
-	public void tesValidationError(){
-		String csarPath = "csars/service-invalid-input-args.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0003");
+    }
+
+    @Test
+    public void testIgnoreMaxConformanceLevelNoError() {
+        String csarPath = "csars/service-max-conformence-level.csar";
+        //TODO: Currently, the conformentce level of the csar for this test is 99 (hard coded). Consider to add ability to replace the configuration in run time.
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-	
-	@Test
-	public void testInValidMinConformanceLevelError(){
-		String csarPath = "csars/service-invalid-conformence-level.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        assertNull(captureThrowable);
+    }
+
+    @Test
+    public void testVerifyConformanceLevelVersion9() {
+        String csarPath = "csars/service-Servicetosca9-csar.csar";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0003");
-	}
-
-	@Test
-	public void testIgnoreMaxConformanceLevelNoError(){
-		String csarPath = "csars/service-max-conformence-level.csar";
-		//TODO: Currently, the conformentce level of the csar for this test is 99 (hard coded). Consider to add ability to replace the configuration in run time.
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
-		File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		assertNull(captureThrowable);
-	}
-
-	@Test
-	public void testVerifyConformanceLevelVersion9(){
-		String csarPath = "csars/service-Servicetosca9-csar.csar";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
-		File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		assertNull(captureThrowable);
-	}
-	
-	@Test
-	public void testFileNotFound(){
-		Throwable captureThrowable = captureThrowable("csars/XXX.csar");
-		testThrowable(captureThrowable, "TP0001");
-	}
-	
-	@Test
-	public void testInvalidCsarFormat(){
-		String csarPath = "csars/csar-invalid-zip.zip";
-		String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        assertNull(captureThrowable);
+    }
+
+    @Test
+    public void testFileNotFound() {
+        Throwable captureThrowable = captureThrowable("csars/XXX.csar");
+        testThrowable(captureThrowable, "TP0001");
+    }
+
+    @Test
+    public void testInvalidCsarFormat() {
+        String csarPath = "csars/csar-invalid-zip.zip";
+        String fileLocationString = ToscaParserErrorHandlingTest.class.getClassLoader().getResource(csarPath).getFile();
         File file = new File(fileLocationString);
-		Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
-		testThrowable(captureThrowable, "TP0002");
-	}
-
-	private static void testThrowable(Throwable captureThrowable, String expectedCode) {
-		assertNotNull(captureThrowable);
-		assertTrue(captureThrowable instanceof SdcToscaParserException, "Error thrown is of type "+captureThrowable.getClass().getSimpleName());
-		assertEquals(((SdcToscaParserException)captureThrowable).getCode(), expectedCode);
-	}
-	
-	public static Throwable captureThrowable(String csarPath) {
-		Throwable result = null;
-		try {
-			factory.getSdcCsarHelper(csarPath);
-		} catch( Throwable throwable ) {
-			result = throwable;
-		}
-		return result;
-	}
+        Throwable captureThrowable = captureThrowable(file.getAbsolutePath());
+        testThrowable(captureThrowable, "TP0002");
+    }
+
+    private void testThrowable(Throwable captureThrowable, String expectedCode) {
+        assertNotNull(captureThrowable);
+        assertTrue(captureThrowable instanceof SdcToscaParserException, "Error thrown is of type " + captureThrowable.getClass().getSimpleName());
+        assertEquals(((SdcToscaParserException) captureThrowable).getCode(), expectedCode);
+    }
+
+    public Throwable captureThrowable(String csarPath) {
+        Throwable result = null;
+        try {
+            factory.getSdcCsarHelper(csarPath);
+        } catch (Throwable throwable) {
+            result = throwable;
+        }
+        return result;
+    }
+
 }