Implement source code model copy functionality (#125)

* develop tests for go method modifiers * Fix test * Implement code model copy function * Bump version --------- Co-authored-by: Muntazir Fadhel <mfadhel@hadii.ca>
hadii-tech · Nov 23, 2024 · 73e5193 · 73e5193
1 parent 33b1ec5
commit 73e5193
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.github.hadii-tech</groupId>
 	<artifactId>clarpse</artifactId>
-	<version>7.1.2</version>
+	<version>7.1.3</version>
 	<packaging>jar</packaging>
 
 	<name>${project.groupId}:${project.artifactId}</name>

diff --git a/src/main/java/com/hadii/clarpse/sourcemodel/OOPSourceCodeModel.java b/src/main/java/com/hadii/clarpse/sourcemodel/OOPSourceCodeModel.java
@@ -17,11 +17,14 @@ public class OOPSourceCodeModel implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private static final Logger LOGGER = LogManager.getLogger(OOPSourceCodeModel.class);
+    private Map<String, Component> components = new HashMap<>();
 
     public OOPSourceCodeModel() {
     }
 
-    private final Map<String, Component> components = new HashMap<>();
+    public OOPSourceCodeModel(Map<String, Component> components) {
+        this.components = new HashMap<String, Component>(components);
+    }
 
     private Map<String, Component> getComponents() {
         return components;
@@ -62,4 +65,26 @@ public void removeComponent(String cmpUniqueName) {
     public Stream<Component> components() {
         return components.values().stream();
     }
+
+    public OOPSourceCodeModel copy() {
+        return new OOPSourceCodeModel(this.components);
+    }
+
+    /**
+     * Fetches the current component's parent base component if it exists. This may
+     * not be the component's direct parent.
+     */
+    public Component parentBaseCmp(String cmpUniqueName) throws IllegalArgumentException {
+        String currParentClassName = cmpUniqueName;
+        Optional<Component> parent;
+        for (parent = this.getComponent(currParentClassName); parent.isPresent()
+                && !parent.get().componentType().isBaseComponent(); parent = this.getComponent(currParentClassName)) {
+            currParentClassName = parent.get().parentUniqueName();
+        }
+        if (parent.isPresent()) {
+            return parent.get();
+        } else {
+            throw new IllegalArgumentException("No parent exists for given component: " + cmpUniqueName);
+        }
+    }
 }
diff --git a/src/test/java/com/hadii/test/OOPSourceCodeModelTest.java b/src/test/java/com/hadii/test/OOPSourceCodeModelTest.java
@@ -0,0 +1,68 @@
+package com.hadii.test;
+
+import static junit.framework.TestCase.assertEquals;
+
+import org.junit.Test;
+
+import com.hadii.clarpse.sourcemodel.Component;
+import com.hadii.clarpse.sourcemodel.OOPSourceCodeModel;
+import com.hadii.clarpse.sourcemodel.OOPSourceModelConstants.ComponentType;
+
+public class OOPSourceCodeModelTest {
+
+    @Test
+    public void codeModelCopyTest() {
+        OOPSourceCodeModel original = new OOPSourceCodeModel();
+        Component component = new Component();
+        component.setComponentName("Test");
+        original.insertComponent(component);
+        OOPSourceCodeModel copy = original.copy();
+        assertEquals(true, copy.size() == original.size());
+        assertEquals(1, copy.size());
+    }
+
+    @Test
+    public void codeModelTrueCopyTest() {
+        OOPSourceCodeModel original = new OOPSourceCodeModel();
+        Component component = new Component();
+        component.setComponentName("Test");
+        original.insertComponent(component);
+        OOPSourceCodeModel copy = original.copy();
+        copy.removeComponent(component.uniqueName());
+        assertEquals(false, copy.size() == original.size());
+        assertEquals(1, original.size());
+        assertEquals(0, copy.size());
+    }
+
+    @Test
+    public void parentBaseCmpTest() {
+        OOPSourceCodeModel codeModel = new OOPSourceCodeModel();
+        Component testComponent = new Component();
+        testComponent.setComponentName("Test");
+        testComponent.insertChildComponent("ChildA");
+        testComponent.setComponentType(ComponentType.CLASS);
+
+        Component componentA = new Component();
+        componentA.setComponentName("Test.ChildA");
+        componentA.insertChildComponent("ChildB");
+        componentA.setComponentType(ComponentType.METHOD);
+
+        Component componentB = new Component();
+        componentB.setComponentName("Test.ChildA.ChildB");
+        componentB.setComponentType(ComponentType.LOCAL);
+
+        codeModel.insertComponent(testComponent);
+        codeModel.insertComponent(componentA);
+        codeModel.insertComponent(componentB);
+
+        assertEquals(testComponent, codeModel.parentBaseCmp(componentB.uniqueName()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void parentBaseCmpTestTThrows() {
+        OOPSourceCodeModel childCmp = new OOPSourceCodeModel();
+        Component component = new Component();
+        component.setComponentName("Test");
+        childCmp.parentBaseCmp("Test");
+    }
+}
diff --git a/src/test/java/com/hadii/test/UtilsTest.java b/src/test/java/com/hadii/test/UtilsTest.java
@@ -1,19 +1,17 @@
 package com.hadii.test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+
 import com.hadii.clarpse.CommonDir;
 import com.hadii.clarpse.ResolvedRelativePath;
 import com.hadii.clarpse.compiler.ProjectFile;
 import com.hadii.clarpse.reference.SimpleTypeReference;
 import com.hadii.clarpse.sourcemodel.Component;
 import com.hadii.clarpse.sourcemodel.OOPSourceModelConstants;
 import com.hadii.clarpse.sourcemodel.Package;
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
 
 public class UtilsTest {
 
@@ -121,7 +119,7 @@ public void testCommonDirWithRootDirProvided() throws Exception {
     public void testCommonDirWithEmptyDirProvided() throws Exception {
         String dirA = "";
         String dirB = "/test/src/cuppy";
-        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
+        assertThrows(IllegalArgumentException.class, () -> {
             new CommonDir(dirA, dirB).value();
         });
     }
@@ -134,7 +132,7 @@ public void testCommonDirWithSingleFilePath() throws Exception {
 
     @Test
     public void testProjectFileThrowsOnAbsolutePath() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
+        assertThrows(IllegalArgumentException.class, () -> {
             new ProjectFile("../src/test", "");
         });
     }

diff --git a/src/test/java/com/hadii/test/go/AccessModifiersTest.java b/src/test/java/com/hadii/test/go/AccessModifiersTest.java
@@ -3,7 +3,6 @@
 import com.hadii.clarpse.compiler.ClarpseProject;
 import com.hadii.clarpse.compiler.Lang;
 import com.hadii.clarpse.compiler.ProjectFile;
-import com.hadii.clarpse.compiler.ProjectFiles;
 import com.hadii.clarpse.sourcemodel.OOPSourceCodeModel;
 import org.junit.Test;
 

diff --git a/src/test/java/com/hadii/test/go/GoTestBase.java b/src/test/java/com/hadii/test/go/GoTestBase.java
@@ -1,6 +1,5 @@
 package com.hadii.test.go;
 
-import com.hadii.clarpse.compiler.Lang;
 import com.hadii.clarpse.compiler.ProjectFile;
 import com.hadii.clarpse.compiler.ProjectFiles;
 import org.junit.Before;

diff --git a/src/test/java/com/hadii/test/java/CodeFragmentTest.java b/src/test/java/com/hadii/test/java/CodeFragmentTest.java
@@ -8,7 +8,6 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class CodeFragmentTest {