summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-heat-lib/src/test
diff options
context:
space:
mode:
authorJan Malkiewicz <jan.malkiewicz@nokia.com>2021-01-08 14:28:15 +0100
committerVasyl Razinkov <vasyl.razinkov@est.tech>2021-01-11 10:25:30 +0000
commit69712c820f5ed9345f0f788f8dea4ae16f5f5f00 (patch)
treebd4e9fe6660d9ccb9fcb8b2e48492d954c3377ef /openecomp-be/lib/openecomp-heat-lib/src/test
parent1eeee67f4e115e70ddb6ad62b1446fa6ff6f48a9 (diff)
Fix NPE
Fix NPE during the onboarding of a helm package. NPE was thrown in HeatTreeManager.handleOrphans(): * tree.getHeat()::contains Issue-ID: SDC-3185 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Change-Id: I9e0461cfe18705b6fb53ae318e473bd4e2651305
Diffstat (limited to 'openecomp-be/lib/openecomp-heat-lib/src/test')
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java1
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json14
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json24
-rw-r--r--openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json22
4 files changed, 45 insertions, 16 deletions
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
index e3e19792f5..0ff4bddfe7 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/java/org/openecomp/sdc/heat/services/tree/HeatTreeManagerTest.java
@@ -1,6 +1,7 @@
/*
*
* Copyright © 2017-2018 European Support Limited
+ * Modifications Copyright (C) 2021 Nokia
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
index 4be1e1ddeb..de6026192c 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
@@ -1,23 +1,29 @@
{
+ "heat": [],
"nested": [
{
"fileName": "TOSCA-Metadata",
+ "heat": [],
"nested": [
{
- "fileName": "TOSCA.meta"
+ "fileName": "TOSCA.meta",
+ "heat": []
}
]
},
{
- "fileName": "MainServiceTemplate.yaml"
+ "fileName": "MainServiceTemplate.yaml",
+ "heat": []
},
{
"fileName": "Definitions",
+ "heat": [],
"nested": [
{
- "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+ "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+ "heat": []
}
]
}
]
-} \ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
index 071887b2fb..c6e5cded6f 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
@@ -1,43 +1,55 @@
{
+ "heat": [],
"nested": [
{
"fileName": "TOSCA-Metadata",
+ "heat": [],
"nested": [
{
- "fileName": "TOSCA.meta"
+ "fileName": "TOSCA.meta",
+ "heat": []
}
]
},
{
- "fileName": "MainServiceTemplate.yaml"
+ "fileName": "MainServiceTemplate.yaml",
+ "heat": []
},
{
"fileName": "Definitions",
+ "heat": [],
"nested": [
{
- "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+ "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+ "heat": []
}
]
},
{
"fileName": "Artifacts",
+ "heat": [],
"nested": [
{
"fileName": "OTHER",
+ "heat": [],
"nested": [
{
- "fileName": "clearWaterIMSOTHER.zip"
+ "fileName": "clearWaterIMSOTHER.zip",
+ "heat": []
}
]
},
{
"fileName": "Deployment",
+ "heat": [],
"nested": [
{
"fileName": "OTHER",
+ "heat": [],
"nested": [
{
- "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip"
+ "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip",
+ "heat": []
}
]
}
@@ -46,4 +58,4 @@
]
}
]
-} \ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
index 59fec70152..c73b6b9e7e 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
@@ -1,39 +1,49 @@
{
+ "heat": [],
"nested": [
{
"fileName": "TOSCA-Metadata",
+ "heat": [],
"nested": [
{
- "fileName": "TOSCA.meta"
+ "fileName": "TOSCA.meta",
+ "heat": []
}
]
},
{
- "fileName": "MainServiceTemplate.yaml"
+ "fileName": "MainServiceTemplate.yaml",
+ "heat": []
},
{
"fileName": "Definitions",
+ "heat": [],
"nested": [
{
- "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+ "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+ "heat": []
}
]
},
{
"fileName": "Artifacts",
+ "heat": [],
"nested": [
{
"fileName": "OTHER",
+ "heat": [],
"nested": [
{
- "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip"
+ "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip",
+ "heat": []
},
{
- "fileName": "clearWaterIMSOTHER.zip"
+ "fileName": "clearWaterIMSOTHER.zip",
+ "heat": []
}
]
}
]
}
]
-} \ No newline at end of file
+}