diff options
Diffstat (limited to 'examples/examples-myfirstpolicy/src/test/java')
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java index f19e2c8c3..3ebf8155e 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpLogicTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,7 +80,6 @@ public class MfpLogicTest { } } - /** * Check logic for MyFirstPolicyAlt#1. */ @@ -118,8 +118,8 @@ public class MfpLogicTest { logics.putAll(getTaskLogics(apexPolicyModel)); for (final Entry<String, String> logicvalue : logics.entrySet()) { - final String filename = "examples/models/MyFirstPolicy/2/" + logicvalue.getKey(); final String logic = logicvalue.getValue(); + final String filename = "examples/models/MyFirstPolicy/2/" + logicvalue.getKey(); final String expectedlogic = ResourceUtils.getResourceAsString(filename); assertNotNull("File " + filename + " was not found. It should contain logic for PolicyModel " + apexPolicyModel.getKey(), expectedlogic); diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java index 07dc96ba3..af0e44450 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/MfpModelCliTest.java @@ -94,14 +94,14 @@ public class MfpModelCliTest { + tempModelFile1.getAbsolutePath() + " is not the same as the test Model for " + testApexModel1.getKey(), testApexModel1, generatedmodel); + tempLogFile1.delete(); + tempModelFile1.delete(); + generatedmodel = reader.read(TextFileUtils.getTextFileAsString(tempModelFile2.getAbsolutePath())); assertEquals("Model generated from the CLI (" + testApexModel2CliArgs[1] + ") into file " + tempModelFile2.getAbsolutePath() + " is not the same as the test Model for " + testApexModel2.getKey(), testApexModel2, generatedmodel); - tempLogFile1.delete(); - tempModelFile1.delete(); - tempLogFile2.delete(); tempModelFile2.delete(); |