Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
6ab7240
Create new plug-in for initialisers
AlpTorac Oct 25, 2024
b621f05
Implement interfaces for (adaptable) initialisers
AlpTorac Oct 25, 2024
c381689
Implement abstract class for adaptable initialisers
AlpTorac Oct 25, 2024
a78aa91
Implement an interface for initialiser discovery
AlpTorac Oct 25, 2024
ddce248
Add package commentary for top-level interfaces
AlpTorac Oct 25, 2024
850a508
Implement an interface to extend IInitialiser for EObject
AlpTorac Oct 25, 2024
ff64132
Add package commentary
AlpTorac Oct 25, 2024
2b8042d
Implement an interface to adapt IEObjectInitialiser
AlpTorac Oct 25, 2024
daaeca5
Implement initialiser package for org.emftext.language.java.commons
AlpTorac Oct 25, 2024
47f8f8f
Implement initialiser package for org.emftext.language.java.annotations
AlpTorac Oct 25, 2024
a1d7836
Implement initialiser package for org.emftext.language.java.imports
AlpTorac Oct 25, 2024
f40ad6d
Implement initialiser package for org.emftext.language.java.modifiers
AlpTorac Oct 25, 2024
ac840ae
Implement initialiser package for org.emftext.language.java.operators
AlpTorac Oct 25, 2024
dd7089a
(WIP) Implement initialiser package for org.emftext.language.java.arrays
AlpTorac Oct 25, 2024
70aa32d
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
cffe623
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
29b158f
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
280d2fc
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
5f65531
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
3a71c74
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
73e5d7a
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
4f51e33
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
5011c45
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
4e265fa
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
a69f5e7
(WIP) Implement initialiser package for
AlpTorac Oct 25, 2024
5c0a46a
(WIP) Implement initialiser package for org.emftext.language.java.types
AlpTorac Oct 25, 2024
497971b
Implement initialiser package for org.emftext.language.java.variables
AlpTorac Oct 25, 2024
3fe125d
Implement initialiser package for all JaMoPP-related initialisers
AlpTorac Oct 25, 2024
850b4e9
Add adaptation strategies for some initialisers
AlpTorac Oct 25, 2024
79533d8
Add package commentary
AlpTorac Oct 25, 2024
2f8a7e7
Add an interface for utility tests
AlpTorac Oct 25, 2024
af40e67
Add a utility class
AlpTorac Oct 25, 2024
ad2936a
Add an interface for utility tests that focus on EObject
AlpTorac Oct 25, 2024
b10cab2
Add a utility class
AlpTorac Oct 25, 2024
780d1bd
Add an interface for utility tests that focus on JaMoPP
AlpTorac Oct 25, 2024
86c73d0
Add utility tests
AlpTorac Oct 25, 2024
7415df3
Add package commentary
AlpTorac Oct 25, 2024
829f032
Implement dummy constructs for future tests
AlpTorac Oct 25, 2024
64dbb99
Implement dummy constructs for future tests
AlpTorac Oct 25, 2024
771609b
Implement dummy constructs for future tests
AlpTorac Oct 25, 2024
01d1b80
Implement dummy constructs for future tests
AlpTorac Oct 25, 2024
81b959a
Add package commentary
AlpTorac Oct 25, 2024
61f228a
Add package commentary
AlpTorac Oct 25, 2024
cdb1d95
Add tests for initialiser discovery via initialiser packages
AlpTorac Oct 25, 2024
5e64400
Add tests for methods in IInitialiser
AlpTorac Oct 25, 2024
427e7bd
Add tests for initialiser adaptation
AlpTorac Oct 25, 2024
32eb7cd
Add package commentary
AlpTorac Oct 25, 2024
d613e74
Add missing IdentifierReferenceInitialiserAdapter
AlpTorac Oct 27, 2024
445879c
Change JUnit dependencies
AlpTorac Feb 10, 2025
b4c9e15
Fix return value of float/double literal initialisers
AlpTorac Feb 4, 2025
78d6d88
Add utility method to initialisers
AlpTorac Feb 4, 2025
8c629bf
Add hardcoded expected initialiser count
AlpTorac Feb 4, 2025
a3b9416
Remove redundant methods
AlpTorac Feb 4, 2025
6d2adb2
Use EObject methods in JaMoPPHelper
AlpTorac Feb 4, 2025
83188d2
Edit commentary
AlpTorac Feb 4, 2025
da2d1af
Merge branch 'inits-pull-req' into HEAD
AlpTorac Feb 16, 2025
5bff56e
Create plug-in for first instance tests fitests
AlpTorac Oct 27, 2024
5f5a929
Add interface to adapt similarity checking mechanisms
AlpTorac Oct 27, 2024
700a170
Add abstract class for similarity checking tests
AlpTorac Oct 27, 2024
8539cd4
Add helper class for Resource operations
AlpTorac Oct 27, 2024
9c606a4
Add helper class for EcoreUtil
AlpTorac Oct 27, 2024
10f59c5
Extend AbstractSimilarityTest
AlpTorac Oct 27, 2024
f33e06a
Add an interface for storing expected similarity values
AlpTorac Oct 27, 2024
8f2912c
Add an abstract class for storing expected similarity values
AlpTorac Oct 27, 2024
f6ca766
Implement an interface for adapting initialiser parameters
AlpTorac Oct 27, 2024
78961f3
Implement an interface to generate initialiser parameters
AlpTorac Oct 27, 2024
18ef9b6
Add a singleton
AlpTorac Oct 27, 2024
ce50390
Add package commentary
AlpTorac Oct 27, 2024
9351e9c
Extend AbstractResourceSimilarityTest
AlpTorac Oct 27, 2024
c2d2a3c
Add package commentary
AlpTorac Oct 27, 2024
4c1ff11
Add class for storing Java similarity checker
AlpTorac Oct 27, 2024
34b1ba3
Add initialiser parameter adaptation
AlpTorac Oct 27, 2024
61c8816
Add expected similarity values
AlpTorac Oct 27, 2024
83a19e2
Add IInitialiserParameters implementation
AlpTorac Oct 27, 2024
c8c727c
Add package commentary
AlpTorac Oct 27, 2024
d9d6d56
Extend AbstractEObjectSimilarityTest
AlpTorac Oct 27, 2024
be94d86
Add similarity checking tests for some SPLevo models
AlpTorac Oct 27, 2024
e0dfce4
Add package commentary
AlpTorac Oct 27, 2024
a71c7c9
Add helper interfaces
AlpTorac Oct 27, 2024
31a5d21
Add parameterised tests for JaMoPP-related similarity checking
AlpTorac Oct 27, 2024
27a2536
Add tests for JaMoPP-related similarity checking
AlpTorac Oct 27, 2024
052e23b
Add advanced tests for JaMoPP-related similarity checking
AlpTorac Oct 27, 2024
19f5d16
Add package commentary
AlpTorac Oct 27, 2024
a0460ef
Add a "meta-test"
AlpTorac Oct 27, 2024
a5c12d8
Add general tests for JaMoPP-related similarity checking
AlpTorac Oct 27, 2024
cafa800
Add package commentary
AlpTorac Oct 27, 2024
fb90fd3
Add package commentary
AlpTorac Oct 27, 2024
030fc77
Change JUnit dependencies
AlpTorac Feb 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions commit-based-cipm/fi-tests/cipm.consistency.fitests/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
28 changes: 28 additions & 0 deletions commit-based-cipm/fi-tests/cipm.consistency.fitests/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cipm.consistency.fitests</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: cipm.consistency.fitests
Bundle-SymbolicName: cipm.consistency.fitests
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: cipm.consistency.fitests
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: junit-jupiter-api,
junit-jupiter-engine,
junit-jupiter-params,
org.eclipse.emf.common,
org.eclipse.emf.ecore,
org.eclipse.emf.compare,
org.eclipse.emf.ecore.xmi,
org.splevo.jamopp.diffing,
org.apache.log4j,
org.emftext.language.java,
jamopp.parser.jdt.singlefile,
jamopp.parser,
cipm.consistency.commitintegration.diff.util,
cipm.consistency.initialisers
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class AddExtendsClass {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class ChangedExtendsClass extends Integer {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class DeleteExtendsClass extends Integer {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class AddExtendsClass extends String {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class ChangedExtendsClass extends String {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class DeleteExtendsClass {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface AddExtends {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface ChangedExtends extends Cloneable {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface DeleteExtends extends Cloneable {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface AddExtends extends Runnable {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface ChangedExtends extends Runnable {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface DeleteExtends {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class AddExtendsClass {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class ChangedExtendsClass implements InterfaceB {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class DeleteExtendsClass implements InterfaceB {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface InterfaceA {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface InterfaceB {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class AddExtendsClass implements InterfaceA {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class ChangedExtendsClass implements InterfaceA {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public class DeleteExtendsClass {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface InterfaceA {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public interface InterfaceB {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class MyClass {

private void someMethod() {
System.out.println(1);
System.out.println(2);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class MyClass {

private void someMethod() {
System.out.println(2);
System.out.println(1);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class MyClass {

public void doSth() {
int a = 0;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class MyClass {

public void doSth() {
int a = 1;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
public class MyClass {

public void doSth() {
System.out.println(1);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
public class MyClass {

public void doSth() {
if(true) {
System.out.println(1);
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package org.splevo.jamopp.diffing.tests.access;

import java.util.ArrayList;
import java.util.List;

import javax.xml.xpath.XPath;

public class ExternalTypeAccess {

@SuppressWarnings("unused")
private XPath path;

public void typeAsListType() {
List<XPath> paths = new ArrayList<XPath>();
System.out.println(paths);
}

public void typeAsArrayParameter(XPath[] extents){
System.out.println(extents);
}

/**
* An unresolveable reference in a java doc comment tag that is not changed.
*
* @see org.netbeans.lib.jmi.xmi.XmiContext#XmiContext(javax.xml.xpath.XPath[], org.netbeans.api.xmi.XMIInputConfig)
*/
public void typeInJavaDocTag(){
}

@SuppressWarnings("unused")
public void typeInMethod(){
XPath path;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package org.splevo.jamopp.diffing.tests.access;

import java.util.ArrayList;
import java.util.List;

import javax.xml.xpath.XPath;

public class ExternalTypeAccess {

@SuppressWarnings("unused")
private XPath path;

public void typeAsListType() {
List<XPath> paths = new ArrayList<XPath>();
System.out.println(paths);
}

public void typeAsArrayParameter(XPath[] extents){
System.out.println(extents);
}

/**
* An unresolveable reference in a java doc comment tag that is not changed.
*
* @see org.netbeans.lib.jmi.xmi.XmiContext#XmiContext(javax.xml.xpath.XPath[], org.netbeans.api.xmi.XMIInputConfig)
*/
public void typeInJavaDocTag(){
}

@SuppressWarnings("unused")
public void typeInMethod(){
XPath path;
}

}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.splevo.examples.calculator;

import org.jscience.mathematics.number.LargeInteger;

/**
* The calculator to perform numeric calculations.
* This makes use of the LargeInteger class of the
* JScience mathematics library (www.jscience.org)
*/
public class CalculatorGCD {

/**
* Calculate the greatest common denominator (divider) (GCD) of an integer
* @param value1 The first number to get the gcd.
* @param value2 The second number to get the gcd.
* @return
*/
public String gcd(String value1, String value2){

LargeInteger integerValue1 = LargeInteger.valueOf(value1);
LargeInteger integerValue2 = LargeInteger.valueOf(value2);
LargeInteger gcd = integerValue1.gcd(integerValue2);

return gcd.toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.splevo.examples.calculator;

import org.jscience.mathematics.number.FloatingPoint;

/**
* Calculator to get the positive square root of
* a floating point number.
* This makes use of the FloatingPoint class of the
* JScience mathematics library (www.jscience.org)
*/
public class CalculatorSqrt {

/**
* Calculate the square root (sqrt) of a floating point number.
* @param value1 The number to get the square root for.
* @return The calculated square root.
*/
public String sqrt(String value1){

FloatingPoint floatingPointValue = FloatingPoint.valueOf(value1);
FloatingPoint sqrt = floatingPointValue.sqrt();

return sqrt.toString();
}

}
Loading