unit tests - asdctool

Additional junit tests

Change-Id: I889772efaccbc6f1555d50cd47a02d868348d310
Issue-ID: SDC-2326
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>

3 files changed, 163 insertions, 123 deletions

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentInstanceRow.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentInstanceRow.java
new file mode 100644
index 0000000000..f2ee154644
--- /dev/null
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentInstanceRow.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia 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.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.sdc.asdctool.impl;
+
+public class ComponentInstanceRow {
+    private String uniqueId;
+    private String name;
+    private String originUid;
+    private String originType;
+    private String containerUid;
+
+    public String getContainerUid() {
+        return containerUid;
+    }
+
+    public void setContainerUid(String containerUid) {
+        this.containerUid = containerUid;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOriginUid() {
+        return originUid;
+    }
+
+    public void setOriginUid(String componentUid) {
+        this.originUid = componentUid;
+    }
+
+    public String getOriginType() {
+        return originType;
+    }
+
+    public void setOriginType(String originType) {
+        this.originType = originType;
+    }
+}
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentRow.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentRow.java
new file mode 100644
index 0000000000..795810c47c
--- /dev/null
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ComponentRow.java
@@ -0,0 +1,95 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2019 Nokia. 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.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.sdc.asdctool.impl;
+
+public class ComponentRow {
+    private String uniqueId;
+    private String type;
+    private String name;
+    private String toscaResourceName;
+    private String resourceType;
+    private String version;
+    private Boolean isDeleted;
+    private Boolean hasNonCalculatedReqCap;
+
+    public Boolean getHasNonCalculatedReqCap() {
+        return hasNonCalculatedReqCap;
+    }
+
+    public void setHasNonCalculatedReqCap(Boolean hasNonCalculatedReqCap) {
+        this.hasNonCalculatedReqCap = hasNonCalculatedReqCap;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getToscaResourceName() {
+        return toscaResourceName;
+    }
+
+    public void setToscaResourceName(String toscaResourceName) {
+        this.toscaResourceName = toscaResourceName;
+    }
+
+    public String getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(String resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public Boolean getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(Boolean deleted) {
+        this.isDeleted = deleted;
+    }
+}
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzer.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzer.java
index 2aed83c823..1b065c2795 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzer.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/GraphMLDataAnalyzer.java
@@ -241,127 +241,4 @@ public class GraphMLDataAnalyzer {
 		return res;
 	}
 
-	private class ComponentRow {
-
-		private String uniqueId;
-		private String type;
-		private String name;
-		private String toscaResourceName;
-		private String resourceType;
-		private String version;
-		private Boolean isDeleted;
-		private Boolean hasNonCalculatedReqCap;
-
-		public Boolean getHasNonCalculatedReqCap() {
-			return hasNonCalculatedReqCap;
-		}
-
-		public void setHasNonCalculatedReqCap(Boolean hasNonCalculatedReqCap) {
-			this.hasNonCalculatedReqCap = hasNonCalculatedReqCap;
-		}
-
-		public String getType() {
-			return type;
-		}
-
-		public void setType(String type) {
-			this.type = type;
-		}
-
-		public String getUniqueId() {
-			return uniqueId;
-		}
-
-		public void setUniqueId(String uniqueId) {
-			this.uniqueId = uniqueId;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public String getToscaResourceName() {
-			return toscaResourceName;
-		}
-
-		public void setToscaResourceName(String toscaResourceName) {
-			this.toscaResourceName = toscaResourceName;
-		}
-
-		public String getResourceType() {
-			return resourceType;
-		}
-
-		public void setResourceType(String resourceType) {
-			this.resourceType = resourceType;
-		}
-
-		public String getVersion() {
-			return version;
-		}
-
-		public void setVersion(String version) {
-			this.version = version;
-		}
-
-		public Boolean getIsDeleted() {
-			return isDeleted;
-		}
-
-		public void setIsDeleted(Boolean deleted) {
-			this.isDeleted = deleted;
-		}
-	}
-
-	private class ComponentInstanceRow {
-		private String uniqueId;
-		private String name;
-		private String originUid;
-		private String originType;
-		private String containerUid;
-
-		public String getContainerUid() {
-			return containerUid;
-		}
-
-		public void setContainerUid(String containerUid) {
-			this.containerUid = containerUid;
-		}
-
-		public String getUniqueId() {
-			return uniqueId;
-		}
-
-		public void setUniqueId(String uniqueId) {
-			this.uniqueId = uniqueId;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		public String getOriginUid() {
-			return originUid;
-		}
-
-		public void setOriginUid(String componentUid) {
-			this.originUid = componentUid;
-		}
-
-		public String getOriginType() {
-			return originType;
-		}
-
-		public void setOriginType(String originType) {
-			this.originType = originType;
-		}
-	}
 }