Skip to main content
summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-09Make the "scope" unit tests pass : we had an NPE with scoped matching.mergetestslgoubet1-5/+6
2011-08-09Adding the necessary unit tests to make sure that scope does not breaklgoubet5-3/+278
the difference detection.
2011-08-08checkstylelgoubet1-138/+87
2011-08-05Fixing the UML test suitelgoubet5-100/+99
2011-08-05Potentially merging duplicates with eOppositeslgoubet1-4/+6
2011-08-05Introduce the necessary fixes for all of the new use cases to pass.lgoubet3-64/+155
2011-08-05Enhance list of use cases with the single-valued reference use cases.lgoubet20-1/+855
Provide the unit tests for all of these new use cases
2011-08-05Renaming input datalgoubet2-3/+3
2011-08-05Regenerating test metamodel in order to introduce the new conceptslgoubet4-0/+437
needed for the "single-valued reference" merge use cases.
2011-08-05Regenerating test metamodel in order to introduce the new conceptslgoubet8-10/+399
needed for the "single-valued reference" merge use cases.
2011-08-05Instantiate a new list instead of reusing it.lgoubet1-2/+2
2011-08-04Providing all the unit tests in order to also test three way comparisonlgoubet43-1/+2601
for all our use cases.
2011-08-04We could have no resourcelgoubet1-19/+23
2011-08-04Make sure that 3-way Comparisons of EObjects with no resource don'tlgoubet1-17/+36
fail.
2011-08-04353414: [Performance] NameSimilarity.pairs should use Set implementation ↵Cedric Brun5-93/+157
instead of List https://bugs.eclipse.org/bugs/show_bug.cgi?id=353414
2011-08-04Merge branch 'mergetests'lgoubet102-790/+3791
2011-08-04Enhancing use cases with the list of "complex" attribute reordering.lgoubet18-1/+318
Providing the unit tests for these new use cases.
2011-08-04API tooling on the generated codelgoubet1-0/+1
2011-08-04Provide the necessary merger for EMF Compare to be able to mergelgoubet2-0/+234
Attribute ordering changes.
2011-08-04Make sure that EMF Compare can now detect changes on the ordering oflgoubet2-149/+500
multi-valued attributes.
2011-08-04API tooling on the generated codelgoubet2-0/+13
2011-08-04Introduce the AttributeOrderChange DiffElement.lgoubet32-486/+907
2011-08-04Providing the unit tests for the attribute changeslgoubet28-1/+732
2011-08-04extracting the "testLeft" and "testRight" test methods out of thelgoubet9-10/+75
abstract class.
2011-08-04Enhancing "test" metamodel with single and multi-valued attributeslgoubet12-0/+829
2011-08-04Enhancing list of use cases with the "attribute" changeslgoubet2-144/+183
2011-08-04353414: [Performance] NameSimilarity.pairs should use Set implementation ↵Cedric Brun4-15/+41
instead of List https://bugs.eclipse.org/bugs/show_bug.cgi?id=353414 This change has a small effect on the overall score of every match.
2011-08-03Trying out new config for masterlgoubet1-1/+1
2011-08-03Changing releng files to reflect the master branchlgoubet2-2/+2
2011-08-03Enhancing list of possible comparison use cases with multiplelgoubet86-22/+2800
containment references cases. Providing the corresponding unit tests.
2011-08-02Merge branch 'master' into mergetestslgoubet21-174/+527
2011-08-02Provide the use cases and unit tests for a number of possibilitieslgoubet45-0/+1378
involving containment reference : multi-value containment reference and single value containment reference.
2011-08-02Extract to super class in order to create more input data.lgoubet2-12/+29
2011-08-02Enhance list of the different possible comparison use caseslgoubet1-31/+63
2011-08-02Create and generate the code of a custom metamodel for the merge tests.lgoubet17-7/+2034
2011-08-02Allow for the use of the EMFCompareEObjectCopier for single valuedlgoubet3-45/+74
references, and use it from the UpdateReferenceMerger. (Basically, "make the merging of UpdateReferences work".)
2011-08-02Beginning listing of merge use caseslgoubet1-0/+36
2011-08-02Prevent EMF Compare from failing in NPE when merging EObjects notlgoubet5-33/+285
contained in any resource. Providing a new algorithm for these cases : we copied the ResourceImpl#getEObject implementation to seek through the containment tree of the copied EObject's root container.
2011-08-02Consider elements that are out of the scope as if they were proxies :lgoubet2-40/+59
when checking for changes in a reference value, elements that are either out of scope or proxies will be considered to match if their URI is equal.
2011-08-02Don't try and copy values that are contained by a resource which cannotlgoubet1-1/+6
be updated.
2011-08-02Add check to avoid detecting differences on proxyfied referenceslgoubet1-0/+39
2011-08-02Respect ordering when merging additions/deletions of values inside algoubet3-10/+38
many-valued reference
2011-08-02respect ordering when merging "moves"lgoubet1-2/+24
2011-08-02Extending the Merge tests based on history models to add cases where :Cedric Brun8-8/+315
- the models are matched/merged using their resource set - the models are matched/merged only using their resource - the models are matched/merged detached from any resource Right now launching the AllMergeTests I get, 120 total tests, 5 errors and 16 failures
2011-08-02We were inverting left and right when "undoing" refernce changes.lgoubet2-4/+4
2011-08-02[353217] some of the "referenced" EObjects may not be located in anylgoubet1-9/+14
resource. The only one we know of is "EPackage.eFactoryInstance" ... but there could be more.
2011-08-02Merging Cedric's changeslgoubet4-5/+36
2011-08-02fixing an issue with merging proxiesCedric Brun1-6/+21
2011-08-02making sure left/right is actually useful in the testsCedric Brun1-2/+9
2011-08-02fixing classcast when merging Ecore filesCedric Brun1-2/+7

Back to the top