From 6f2d7c7bd510345436f54fd1554280cc731a1dc4 Mon Sep 17 00:00:00 2001 From: Andrew Gauld Date: Thu, 23 Jan 2020 13:38:51 +0000 Subject: Improve mod/genprocessor code coverage Change-Id: I954f6b9d0dafd348ffd0df629fd181c2350e78f0 Issue-ID: DCAEGEN2-1860 Signed-off-by: Andrew Gauld --- mod/genprocessor/pom.xml | 65 +++++--- .../main/java/org/onap/dcae/genprocessor/App.java | 18 +-- .../src/test/java/sandbox/AppTest.java | 163 ++++++++++++++++++--- 3 files changed, 196 insertions(+), 50 deletions(-) (limited to 'mod/genprocessor') diff --git a/mod/genprocessor/pom.xml b/mod/genprocessor/pom.xml index 3b916ca..0aed60a 100644 --- a/mod/genprocessor/pom.xml +++ b/mod/genprocessor/pom.xml @@ -1,5 +1,21 @@ + 4.0.0 @@ -22,6 +38,7 @@ org.onap.dcae.genprocessor.App 1.9.2 + 0.32.0 @@ -80,18 +97,25 @@ 4.11 test + + com.github.stefanbirkner + system-rules + 1.19.0 + test + io.fabric8 docker-maven-plugin + ${docker.fabric.version} true ${docker.pull.registry} ${docker.push.registry} - + onap/${project.groupId}.${project.artifactId}-http ${onap.nexus.dockerregistry.daily} @@ -101,27 +125,27 @@ ${project.version} ${project.version}-${maven.build.timestamp}Z - - / - - - - ./nginx.conf - /etc/nginx/conf.d - default.conf - - - - + + / + + + + ./nginx.conf + /etc/nginx/conf.d + default.conf + + + + - nginx - -g - daemon off; - - - - + nginx + -g + daemon off; + + + + onap/${project.groupId}.${project.artifactId}-job ${onap.nexus.dockerregistry.daily} @@ -139,7 +163,6 @@ /work http://onboarding-api/onboarding - /code/target/classes/sandbox/DCAEPROCESSOR.class 10 diff --git a/mod/genprocessor/src/main/java/org/onap/dcae/genprocessor/App.java b/mod/genprocessor/src/main/java/org/onap/dcae/genprocessor/App.java index 7cee8b0..9c50991 100644 --- a/mod/genprocessor/src/main/java/org/onap/dcae/genprocessor/App.java +++ b/mod/genprocessor/src/main/java/org/onap/dcae/genprocessor/App.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 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. @@ -23,6 +23,7 @@ import javassist.CtClass; import java.io.File; import java.io.FilenameFilter; +import java.io.InputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; @@ -160,13 +161,13 @@ public class App { } } - private static boolean copyProcessorClassFile(File pathClassFile, File dirBuild) { + private static boolean copyProcessorClassFile(String classResourceName, File dirBuild) { File dirSandbox = new File(dirBuild, "org/onap/dcae/genprocessor"); if (dirSandbox.exists() || dirSandbox.mkdir()) { - try { - File dest = new File(dirSandbox, pathClassFile.getName()); - Files.copy(pathClassFile.toPath(), dest.toPath()); + try (InputStream asStream = App.class.getResourceAsStream(classResourceName)) { + File dest = new File(dirSandbox, classResourceName); + Files.copy(asStream, dest.toPath()); return true; } catch (FileAlreadyExistsException e) { // Do nothing, class file already exists @@ -308,7 +309,7 @@ public class App { return false; } - public static void main(String[] args) throws InterruptedException { + public static void main(String[] args) throws InterruptedException, URISyntaxException { if (args.length == 0) { args = new String[] { "gen" }; String sleepstr = System.getenv("GENPROC_SLEEP_SEC"); @@ -328,7 +329,7 @@ public class App { } - public static void main2(String[] args) { + public static void main2(String[] args) throws URISyntaxException { String argsStr = String.join(", ", args); if (argsStr.contains("-h")) { LOG.info("Here are the possible args:"); @@ -343,7 +344,6 @@ public class App { // Config from env variables File dirWorking = new File(System.getenv("GENPROC_WORKING_DIR")); String hostOnboardingAPI = System.getenv("GENPROC_ONBOARDING_API_HOST"); - File processorClassFile = new File(System.getenv("GENPROC_PROCESSOR_CLASSFILE_PATH")); String urlToJarIndex = System.getenv("GENPROC_JAR_INDEX_URL"); String[] paramsToPrint = new String[] { @@ -380,7 +380,7 @@ public class App { writeManifestThing(dirBuild, generateManifestMF(comp.compSpec), "META-INF", "MANIFEST.MF"); writeManifestThing(dirBuild, Arrays.asList(createClassName(comp.compSpec)), "META-INF/services", "org.apache.nifi.processor.Processor"); - copyProcessorClassFile(processorClassFile, dirBuild); + copyProcessorClassFile("DCAEProcessor.class", dirBuild); packageJar(dirWorking, dirBuild, jarName); } } diff --git a/mod/genprocessor/src/test/java/sandbox/AppTest.java b/mod/genprocessor/src/test/java/sandbox/AppTest.java index dddd0fd..d6a1ca3 100644 --- a/mod/genprocessor/src/test/java/sandbox/AppTest.java +++ b/mod/genprocessor/src/test/java/sandbox/AppTest.java @@ -15,41 +15,164 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package sandbox; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; + +import java.net.URISyntaxException; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.processor.ProcessContext; +import org.apache.nifi.processor.ProcessSession; +import org.apache.nifi.processor.Relationship; +import org.apache.nifi.processor.exception.ProcessException; +import org.junit.Rule; import org.junit.Test; +import org.junit.contrib.java.lang.system.EnvironmentVariables; +import org.junit.rules.TemporaryFolder; +import org.onap.dcae.genprocessor.App; import org.onap.dcae.genprocessor.CompSpec; +import org.onap.dcae.genprocessor.DCAEProcessor; +import org.onap.dcae.genprocessor.OnboardingAPIClient; import org.onap.dcae.genprocessor.Utils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Unit test for simple App. */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ +public class AppTest { + static final Logger LOG = LoggerFactory.getLogger(AppTest.class); + + @Rule + public final EnvironmentVariables evars = new EnvironmentVariables(); + + @Rule + public TemporaryFolder tfolder = new TemporaryFolder(); + + @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); + public void testUtils() { + new Utils(); + assertEquals(Utils.formatNameForJavaClass("part1.a-bee"), "Part1ABee"); + HashMap mx = new HashMap<>(); + mx.put("name", "SomeJar"); + mx.put("version", "2.0"); + mx.put("description", "desc"); + CompSpec cs = new CompSpec(); + cs.unpackSelf(mx); + assertEquals(Utils.formatNameForJar(cs), "SomeJar-2.0"); } - /** - * Test Utils - */ + @Test - public void testUtils() - { - new Utils(); - assertEquals(Utils.formatNameForJavaClass("part1.a-bee"), "Part1ABee"); - CompSpec cs = new CompSpec(); - cs.name = "SomeJar"; - cs.version = "2.0"; - assertEquals(Utils.formatNameForJar(cs), "SomeJar-2.0"); + public void testDcaeProcessor() throws ProcessException { + DCAEProcessor px = new DCAEProcessor() { + public String getName() { + return (null); + } + + public String getVersion() { + return (null); + } + + public String getComponentId() { + return (null); + } + + public String getComponentUrl() { + return (null); + } + + protected List buildSupportedPropertyDescriptors() { + return (new LinkedList<>()); + } + + protected Set buildRelationships() { + return (new HashSet<>()); + } + + public DCAEProcessor xxx() { + getSupportedPropertyDescriptors(); + getSupportedPropertyDescriptors(); + return (this); + } + }.xxx(); + px.ping(); + px.onTrigger((ProcessContext)null, (ProcessSession)null); + px.getRelationships(); + px.getRelationships(); + } + + + @Test + public void testPaths() throws InterruptedException, IOException, URISyntaxException { + /* some trivial cases */ + new OnboardingAPIClient(); + try { + OnboardingAPIClient.getComponents("6:invalidURI"); + } catch (OnboardingAPIClient.OnboardingAPIClientError oace) { + // expected case + } + try { + OnboardingAPIClient.getComponent(null); + } catch (OnboardingAPIClient.OnboardingAPIClientError oace) { + // expected case + } + /* background one shot failure cases */ + evars.clear("GENPROC_SLEEP_SEC"); + App.main(new String[0]); + evars.set("GENPROC_SLEEP_SEC", "0"); + String wdir = tfolder.newFolder("work").getPath(); + evars.set("GENPROC_WORKING_DIR", wdir); + String onboardingdir = tfolder.newFolder("onboarding").getPath(); + evars.set("GENPROC_ONBOARDING_API_HOST", (new File(onboardingdir)).toURI().toURL().toString()); + String compfile = onboardingdir + "/compone"; + try (Writer w = new FileWriter(compfile)) { + w.write("{ \"id\": \"1\", \"spec\": { \"name\": \"one-collector\"," + + " \"version\": \"1.0.0\", \"description\": \"desc\"," + + " \"parameters\": [{\"name\": \"p1\", \"value\": \"v1\"," + + " \"description\": \"d1\"}], \"streams\":" + + " {\"publishes\":[{\"format\": \"f1\", \"version\": \"v1\"," + + " \"type\": \"t1\", \"config_key\": \"ck1\"}]," + + " \"subscribes\":[{\"format\": \"f2\", \"version\": \"v2\"," + + " \"type\": \"t2\", \"config_key\": \"ck2\"}]}}," + + " \"selfUrl\": \"file:" + compfile + "\"}"); + } + try (Writer w = new FileWriter(onboardingdir + "/components")) { + w.write("{\"components\": [{\"id\": \"1\", \"name\": \"one\"," + + " \"version\": \"1.0.0\", \"description\": \"desc\"," + + " \"componentType\": \"apple\", \"owner\": \"John Doe\"," + + " \"componentUrl\": \"file:" + compfile + "\"," + + " \"whenAdded\": \"never\" }]}"); + } + String indexfile = tfolder.newFile("index").getPath(); + try (Writer w = new FileWriter(indexfile)) { + w.write("[]"); + } + evars.set("GENPROC_JAR_INDEX_URL", (new File(indexfile)).toURI().toURL().toString()); + App.main(new String[0]); + /* help case */ + App.main(new String[] { "-h" }); + /* load case */ + App.main(new String[] { "load" }); + /* gen case */ + App.main(new String[] { "gen" }); } } -- cgit 1.2.3-korg