Inline method Improvement

test/dataset_collection/InlineExamples/AbstractMarshaller_cut.java

@@ -0,0 +1,21 @@
+public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
+
+    public synchronized void removeChild(String propertyName, C component) {
+        verifyWrite();
+        if (component == null) {
+            throw new IllegalArgumentException("component == null"); //NOI18N
+        }
+        if (! _getChildren().contains(component)) {
+            throw new IllegalArgumentException(
+                    "component to be deleted is not a child"); //NOI18N
+        }
+        _removeChildQuietly(component, _getChildren());
+        firePropertyChange(propertyName, component, null);
+        fireChildRemoved();
+    }
+
+    protected void fireChildRemoved() {
+        getModel().fireComponentChangedEvent(new ComponentEvent(this,
+                ComponentEvent.EventType.CHILD_REMOVED));
+    }
+}

test/dataset_collection/InlineExamples/EntityResolver_cut.java

@@ -0,0 +1,42 @@
+public abstract class Test {
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER =
+			(publicId, systemId) -> new InputSource(new StringReader(""));
+
+	/** Logger available to subclasses. */
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
+	@Nullable
+	private DocumentBuilderFactory documentBuilderFactory;
+
+	private final Object documentBuilderFactoryMonitor = new Object();
+
+	protected Document buildDocument() {
+		try {
+			DocumentBuilder documentBuilder;
+			synchronized (this.documentBuilderFactoryMonitor) {
+				if (this.documentBuilderFactory == null) {
+					this.documentBuilderFactory = createDocumentBuilderFactory();
+				}
+				documentBuilder = createDocumentBuilder(this.documentBuilderFactory);
+			}
+			return documentBuilder.newDocument();
+		}
+		catch (ParserConfigurationException ex) {
+			throw new UnmarshallingFailureException("Could not create document placeholder: " + ex.getMessage(), ex);
+		}
+	}
+
+	protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setNamespaceAware(true);
+		factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+		factory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+		return factory;
+	}
+
+}

test/dataset_collection/InlineTestExamples/AbstractMarshaller_cut.java

@@ -0,0 +1,22 @@
+public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
+
+    public synchronized void removeChild(String propertyName, C component) {
+        verifyWrite();
+        if (component == null) {
+            throw new IllegalArgumentException("component == null"); //NOI18N
+        }
+        if (! _getChildren().contains(component)) {
+            throw new IllegalArgumentException(
+                    "component to be deleted is not a child"); //NOI18N
+        }
+        _removeChildQuietly(component, _getChildren());
+        firePropertyChange(propertyName, component, null);
+        getModel().fireComponentChangedEvent(new ComponentEvent(this,
+                ComponentEvent.EventType.CHILD_REMOVED));
+    }
+
+    protected void fireChildRemoved() {
+        getModel().fireComponentChangedEvent(new ComponentEvent(this,
+                ComponentEvent.EventType.CHILD_REMOVED));
+    }
+}

test/dataset_collection/InlineTestExamples/EntityResolver_cut.java

@@ -0,0 +1,47 @@
+public abstract class Test {
+	private static final EntityResolver NO_OP_ENTITY_RESOLVER =
+			(publicId, systemId) -> new InputSource(new StringReader(""));
+
+	/** Logger available to subclasses. */
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private boolean supportDtd = false;
+
+	private boolean processExternalEntities = false;
+
+	@Nullable
+	private DocumentBuilderFactory documentBuilderFactory;
+
+	private final Object documentBuilderFactoryMonitor = new Object();
+
+	protected Document buildDocument() {
+		try {
+			DocumentBuilder documentBuilder;
+			synchronized (this.documentBuilderFactoryMonitor) {
+				if (this.documentBuilderFactory == null) {
+					DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+					factory.setValidating(false);
+					factory.setNamespaceAware(true);
+					factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+					factory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+					this.documentBuilderFactory = factory;
+				}
+				documentBuilder = createDocumentBuilder(this.documentBuilderFactory);
+			}
+			return documentBuilder.newDocument();
+		}
+		catch (ParserConfigurationException ex) {
+			throw new UnmarshallingFailureException("Could not create document placeholder: " + ex.getMessage(), ex);
+		}
+	}
+
+	protected DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setNamespaceAware(true);
+		factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd());
+		factory.setFeature("http://xml.org/sax/features/external-general-entities", isProcessExternalEntities());
+		return factory;
+	}
+
+}

test/dataset_collection/InlineTestExamples/PlanetDialog.java

@@ -71,8 +71,7 @@ public PlanetDialog(){
             bloom.dispose();
             bloom = null;
         }
-
-        bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false, true){{
+         bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false, true){{
             setClearColor(0, 0, 0, 0);
             setThreshold(0.8f);
             blurPasses = 6;

test/dataset_collection/test_dataset_collection.py

@@ -8,7 +8,10 @@
     is_match_to_the_conditions)
 from veniq.ast_framework import AST, ASTNodeType
 from veniq.dataset_collection.types_identifier import (
-    InlineTypesAlgorithms, InlineWithoutReturnWithoutArguments, InlineWithReturnWithoutArguments)
+    InlineTypesAlgorithms,
+    InlineWithoutReturnWithoutArguments,
+    InlineWithReturnWithoutArguments,
+    AlgorithmFactory)
 from veniq.utils.ast_builder import build_ast
 
 
@@ -277,3 +280,27 @@ def test_is_valid_function_with_return_in_the_middle(self):
             if x.member == 'severalReturns'][0]
         is_matched = is_match_to_the_conditions(ast, m_inv, m_decl_original)
         self.assertEqual(is_matched, False)
+
+    def test_inline_invocation_inside_var_declaration(self):
+        filepath = self.current_directory / 'InlineExamples' / 'EntityResolver_cut.java'
+        test_filepath = self.current_directory / 'InlineTestExamples' / 'EntityResolver_cut.java'
+        temp_filename = self.current_directory / 'temp.java'
+        algorithm_type = InlineTypesAlgorithms.WITH_RETURN_WITHOUT_ARGUMENTS
+        algorithm_for_inlining = AlgorithmFactory().create_obj(algorithm_type)
+        algorithm_for_inlining().inline_function(filepath, 22, 34, 40, temp_filename)
+        with open(temp_filename, encoding='utf-8') as actual_file, \
+                open(test_filepath, encoding='utf-8') as test_ex:
+            self.assertEqual(actual_file.read(), test_ex.read())
+        temp_filename.unlink()
+
+    def test_inline_inside_invokation_several_lines(self):
+        filepath = self.current_directory / 'InlineExamples' / 'AbstractMarshaller_cut.java'
+        test_filepath = self.current_directory / 'InlineTestExamples' / 'AbstractMarshaller_cut.java'
+        temp_filename = self.current_directory / 'temp.java'
+        algorithm_type = InlineTypesAlgorithms.WITH_RETURN_WITHOUT_ARGUMENTS
+        algorithm_for_inlining = AlgorithmFactory().create_obj(algorithm_type)
+        algorithm_for_inlining().inline_function(filepath, 14, 18, 20, temp_filename)
+        with open(temp_filename, encoding='utf-8') as actual_file, \
+                open(test_filepath, encoding='utf-8') as test_ex:
+            self.assertEqual(actual_file.read(), test_ex.read())
+        temp_filename.unlink()