[uima-uimaj] 01/01: [UIMA-6300] deep copy feature for org.apache.uima.analysis_engine.AnalysisEngineDescription class

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch UIMA-6300-deep-copy
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 46a42745ee4c57c4ce4f93caccd3a3c02f55a002
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Jan 28 17:59:55 2021 +0100

    [UIMA-6300] deep copy feature for org.apache.uima.analysis_engine.AnalysisEngineDescription class
    
    - Added test to check if clone() changes the imports in an AnalysisEngineDescription instance and whether the cloned instance has the same imports (unresolved) as the original
---
 .../impl/AnalysisEngineDescription_implTest.java   | 51 ++++++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
index 8290873..54ea7a9 100644
--- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
@@ -69,6 +69,7 @@ import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
 import org.apache.uima.resource.metadata.ExternalResourceBinding;
 import org.apache.uima.resource.metadata.FsIndexDescription;
 import org.apache.uima.resource.metadata.FsIndexKeyDescription;
+import org.apache.uima.resource.metadata.Import;
 import org.apache.uima.resource.metadata.MetaDataObject;
 import org.apache.uima.resource.metadata.NameValuePair;
 import org.apache.uima.resource.metadata.OperationalProperties;
@@ -95,6 +96,7 @@ import org.apache.uima.util.XMLInputSource;
 import org.apache.uima.util.XMLParser;
 import org.apache.uima.util.XMLizable;
 import org.assertj.core.api.InstanceOfAssertFactories;
+import org.assertj.core.util.introspection.FieldUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -440,12 +442,13 @@ public class AnalysisEngineDescription_implTest {
   @Test
   public void testDelegateImports() throws Exception {
     // create aggregate TAE description and add delegate AE import
-    AnalysisEngineDescription testAgg = new AnalysisEngineDescription_impl();
-    Map<String, MetaDataObject> delegateMap = testAgg
-        .getDelegateAnalysisEngineSpecifiersWithImports();
     Import_impl delegateImport = new Import_impl();
     delegateImport.setLocation(
         getFile("TextAnalysisEngineImplTest/TestPrimitiveTae1.xml").toURI().toURL().toString());
+
+    AnalysisEngineDescription testAgg = new AnalysisEngineDescription_impl();
+    Map<String, MetaDataObject> delegateMap = testAgg
+        .getDelegateAnalysisEngineSpecifiersWithImports();
     delegateMap.put("key", delegateImport);
 
     assertThat(testAgg.getDelegateAnalysisEngineSpecifiers().values()) //
@@ -473,6 +476,46 @@ public class AnalysisEngineDescription_implTest {
   }
 
   @Test
+  public void thatCloneDoesNotResolveDelegateImports() throws Exception {
+    // create aggregate TAE description and add delegate AE import
+    Import_impl delegateImport = new Import_impl();
+    delegateImport.setLocation(
+        getFile("TextAnalysisEngineImplTest/TestPrimitiveTae1.xml").toURI().toURL().toString());
+
+    AnalysisEngineDescription testAgg = new AnalysisEngineDescription_impl();
+    Map<String, MetaDataObject> delegateMap = testAgg
+        .getDelegateAnalysisEngineSpecifiersWithImports();
+    delegateMap.put("key", delegateImport);
+
+    assertThat(testAgg) //
+        .as("Delegate import in original has not been resolved") //
+        .extracting("mDelegateAnalysisEngineSpecifiers", as(InstanceOfAssertFactories.MAP))
+        .isEmpty();
+
+    AnalysisEngineDescription clonedAgg = (AnalysisEngineDescription) testAgg.clone();
+
+    assertThat(testAgg) //
+        .as("Delegate import in original has still not been resolved") //
+        .extracting("mDelegateAnalysisEngineSpecifiers", as(InstanceOfAssertFactories.MAP))
+        .isEmpty();
+
+    assertThat(testAgg.getDelegateAnalysisEngineSpecifiersWithImports().values()) //
+        .as("import is still there in original") //
+        .hasSize(1) //
+        .allMatch(d -> d instanceof Import);
+
+    assertThat(clonedAgg) //
+        .as("Delegate import in clone has not been resolved") //
+        .extracting("mDelegateAnalysisEngineSpecifiers", as(InstanceOfAssertFactories.MAP))
+        .isEmpty();
+
+    assertThat(clonedAgg.getDelegateAnalysisEngineSpecifiersWithImports().values()) //
+        .as("import is still there in clone") //
+        .hasSize(1) //
+        .allMatch(d -> d instanceof Import);
+  }
+
+  @Test
   public void testDoFullValidation() throws Exception {
     // try some descriptors that are invalid due to config. param problems
     for (int i = 1; i <= 13; i++) {
@@ -581,7 +624,7 @@ public class AnalysisEngineDescription_implTest {
   @Test
   public void testNoDelegatesToResolve() throws Exception {
     ResourceSpecifierFactory f = UIMAFramework.getResourceSpecifierFactory();
-    
+
     AnalysisEngineDescription outer = f.createAnalysisEngineDescription();
     AnalysisEngineDescription inner = f.createAnalysisEngineDescription();
     outer.getDelegateAnalysisEngineSpecifiersWithImports().put("inner", inner);