From e0c726443f1e4944402fc6b434cce58ee12197ce Mon Sep 17 00:00:00 2001 From: Matheus Barbosa Date: Wed, 11 Aug 2021 16:10:57 -0300 Subject: [PATCH] refactor(#31): rename test cases and update comments --- ...duralOverridingAssignmentAnalysisTest.java | 68 +++++++++---------- ...ava => AdditionToArrayConflictSample.java} | 2 +- ....java => ArrayAliasingConflictSample.java} | 8 +-- .../ArrayDiferentIndexNotConflictSample.java | 2 +- .../ioa/ArraySameIndexConflictSample.java | 2 +- ...va => ArraysClassFieldConflictSample.java} | 2 +- ...=> ArraysClassFieldNotConflictSample.java} | 2 +- .../ioa/BothMarkingConflictSample.java | 3 +- .../analysis/samples/ioa/CallGraphSample.java | 16 +++-- ...hangeInstanceAttributeConflictSample.java} | 8 +-- ...ChangePublicAttributesConflictSample.java} | 4 +- .../samples/ioa/ClassFieldConflictSample.java | 17 +++++ .../ioa/ClassFieldConflictSample2.java | 22 ++++++ ....java => ClassFieldNotConflictSample.java} | 2 +- ...java => ClassFieldNotConflictSample2.java} | 2 +- ...sFieldWithParameterNotConflictSample.java} | 6 +- ....java => ConcatMethodsConflictSample.java} | 8 +-- .../ioa/ContainsInvokeExpConflictSample.java | 10 +-- ...uteOnIdenticalClassNotConflictSample.java} | 4 +- ...ssWithSameAttributeNotConflictSample.java} | 4 +- ...MethodOnIdenticalClassConflictSample.java} | 6 +- ...Sample.java => HashmapConflictSample.java} | 2 +- ...ample.java => IfBranchConflictSample.java} | 8 +-- .../ioa/IfWithInvokeConflictSample.java | 5 +- ....java => LocalArrayNotConflictSample.java} | 2 +- ...LocalArrayRecursiveNotConflictSample.java} | 2 +- ...a => LocalVariablesNotConflictSample.java} | 2 +- ... => LocalVariablesNotConflictSample2.java} | 4 +- ...iablesWithParameterNotConflictSample.java} | 2 +- ...le.java => ObjectFieldConflictSample.java} | 4 +- ...java => ObjectFieldNotConflictSample.java} | 2 +- ...> ObjectThreeFieldsOneConflictSample.java} | 8 +-- ...assFieldConflictInterProceduralSample.java | 17 ----- ...ssFieldConflictInterProceduralSample2.java | 22 ------ .../ioa/RecursiveCallConflictSample.java | 2 +- .../ioa/RecursiveMockupConflictSample.java | 2 +- .../ioa/RecursiveMockupNotConflictSample.java | 2 +- ...ributeOnIdenticalClassConflictSample.java} | 6 +- ...mple2.java => SequenceConflictSample.java} | 2 +- ...mple.java => SequenceConflictSample2.java} | 4 +- ...va => StaticClassFieldConflictSample.java} | 2 +- ...=> StaticClassFieldNotConflictSample.java} | 2 +- .../samples/ioa/SubclassConflictSample.java | 2 +- ...classWithConditionalNotConflictSample.java | 2 +- 44 files changed, 154 insertions(+), 150 deletions(-) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentAdditionToArrayConflictInterProceduralSample.java => AdditionToArrayConflictSample.java} (81%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentArrayAliasingConflictInterProceduralSample.java => ArrayAliasingConflictSample.java} (54%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentArraysClassFieldConflictInterProceduralSample.java => ArraysClassFieldConflictSample.java} (81%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample.java => ArraysClassFieldNotConflictSample.java} (82%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample.java => ChangeInstanceAttributeConflictSample.java} (57%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentChangePublicAttributesConflictInterProceduralSample.java => ChangePublicAttributesConflictSample.java} (69%) create mode 100644 src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample.java create mode 100644 src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample2.java rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentClassFieldNotConflictInterProceduralSample.java => ClassFieldNotConflictSample.java} (77%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentClassFieldNotConflictInterProceduralSample2.java => ClassFieldNotConflictSample2.java} (79%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample.java => ClassFieldWithParameterNotConflictSample.java} (56%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentConcatMethodsConflictInterProceduralSample.java => ConcatMethodsConflictSample.java} (58%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample.java => DifferentAttributeOnIdenticalClassNotConflictSample.java} (71%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample.java => DifferentClassWithSameAttributeNotConflictSample.java} (74%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample.java => DifferentMethodOnIdenticalClassConflictSample.java} (67%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentHashmapConflictInterProceduralSample.java => HashmapConflictSample.java} (81%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentIfBranchConflictInterProceduralSample.java => IfBranchConflictSample.java} (53%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentLocalArrayNotConflictInterProceduralSample.java => LocalArrayNotConflictSample.java} (76%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentLocalArrayRecursiveNotConflictInterProceduralSample.java => LocalArrayRecursiveNotConflictSample.java} (75%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentLocalVariablesNotConflictInterProceduralSample.java => LocalVariablesNotConflictSample.java} (74%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2.java => LocalVariablesNotConflictSample2.java} (60%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample.java => LocalVariablesWithParameterNotConflictSample.java} (72%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentObjectFieldConflictInterProceduralSample.java => ObjectFieldConflictSample.java} (69%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentObjectFieldNotConflictInterProceduralSample.java => ObjectFieldNotConflictSample.java} (86%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample.java => ObjectThreeFieldsOneConflictSample.java} (71%) delete mode 100644 src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample.java delete mode 100644 src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample2.java rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample.java => SameAttributeOnIdenticalClassConflictSample.java} (58%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentSequenceConflictInterProceduralSample2.java => SequenceConflictSample.java} (73%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentSequenceConflictInterProceduralSample.java => SequenceConflictSample2.java} (50%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentStaticClassFieldConflictInterProceduralSample.java => StaticClassFieldConflictSample.java} (84%) rename src/test/java/br/unb/cic/analysis/samples/ioa/{OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample.java => StaticClassFieldNotConflictSample.java} (82%) diff --git a/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java b/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java index 847982e5..4e99ca8f 100644 --- a/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java +++ b/src/test/java/br/unb/cic/analysis/ioa/InterproceduralOverridingAssignmentAnalysisTest.java @@ -118,7 +118,7 @@ public void subclassTest() { public void callGraphTest() { String sampleClassPath = "br.unb.cic.analysis.samples.ioa.CallGraphSample"; AbstractMergeConflictDefinition definition = DefinitionFactory - .definition(sampleClassPath, new int[]{6, 9, 12}, new int[]{7, 10, 13}); + .definition(sampleClassPath, new int[]{10, 13, 16}, new int[]{11, 14, 17}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); configureTest(analysis); Assert.assertEquals(2, analysis.getConflicts().size()); @@ -128,7 +128,7 @@ public void callGraphTest() { public void ifWithInvokeConflict() { String sampleClassPath = "br.unb.cic.analysis.samples.ioa.IfWithInvokeConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory - .definition(sampleClassPath, new int[]{8}, new int[]{10}); + .definition(sampleClassPath, new int[]{10}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); configureTest(analysis); Assert.assertEquals(1, analysis.getConflicts().size()); @@ -138,7 +138,7 @@ public void ifWithInvokeConflict() { public void containsInvokeExp() { String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ContainsInvokeExpConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory - .definition(sampleClassPath, new int[]{8}, new int[]{10}); + .definition(sampleClassPath, new int[]{10}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); configureTest(analysis); Assert.assertEquals(1, analysis.getConflicts().size()); @@ -159,7 +159,7 @@ public void chainedMethodCallsConflict() { public void bothMarkingConflict() { String sampleClassPath = "br.unb.cic.analysis.samples.ioa.BothMarkingConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory - .definition(sampleClassPath, new int[]{8}, new int[]{8}); + .definition(sampleClassPath, new int[]{8}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); configureTest(analysis); Assert.assertEquals(1, analysis.getConflicts().size()); @@ -167,7 +167,7 @@ public void bothMarkingConflict() { @Test public void classFieldConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentClassFieldConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ClassFieldConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{10}, new int[]{11}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -177,7 +177,7 @@ public void classFieldConflict() { @Test public void classFieldConflict2() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentClassFieldConflictInterProceduralSample2"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ClassFieldConflictSample2"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{10}, new int[]{11}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -187,7 +187,7 @@ public void classFieldConflict2() { @Test public void classFieldNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentClassFieldNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ClassFieldNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{10}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -197,7 +197,7 @@ public void classFieldNotConflict() { @Test public void classFieldNotConflict2() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentClassFieldNotConflictInterProceduralSample2"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ClassFieldNotConflictSample2"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{10}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -207,7 +207,7 @@ public void classFieldNotConflict2() { @Test public void classFieldWithParameterNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ClassFieldWithParameterNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{11}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -220,7 +220,7 @@ public void classFieldWithParameterNotConflict() { @Test public void localVariablesNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentLocalVariablesNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.LocalVariablesNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{6}, new int[]{7}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -230,7 +230,7 @@ public void localVariablesNotConflict() { @Test public void localVariablesNotConflict2() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.LocalVariablesNotConflictSample2"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{6}, new int[]{7}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -240,7 +240,7 @@ public void localVariablesNotConflict2() { @Test public void localVariablesWithParameterNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.LocalVariablesWithParameterNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{6}, new int[]{7}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -251,7 +251,7 @@ public void localVariablesWithParameterNotConflict() { @Ignore @Test public void additionToArrayConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentAdditionToArrayConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.AdditionToArrayConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{11}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -262,7 +262,7 @@ public void additionToArrayConflict() { @Ignore @Test public void hashmapConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentHashmapConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.HashmapConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{12}, new int[]{13}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -273,7 +273,7 @@ public void hashmapConflict() { @Test public void changePublicAttributesConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentChangePublicAttributesConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ChangePublicAttributesConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{7, 10}, new int[]{9}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -283,7 +283,7 @@ public void changePublicAttributesConflict() { @Test public void changeInstanceAttributeConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ChangeInstanceAttributeConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{11}, new int[]{12}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -293,7 +293,7 @@ public void changeInstanceAttributeConflict() { @Test public void differentMethodOnIdenticalClass() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.DifferentMethodOnIdenticalClassConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{12}, new int[]{13}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -303,7 +303,7 @@ public void differentMethodOnIdenticalClass() { @Test public void localArraysNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentLocalArrayNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.LocalArrayNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{6}, new int[]{7}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -313,7 +313,7 @@ public void localArraysNotConflict() { @Test public void classFieldArraysConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentArraysClassFieldConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ArraysClassFieldConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{9}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -323,7 +323,7 @@ public void classFieldArraysConflict() { @Test public void classFieldArraysNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ArraysClassFieldNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{10}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -332,8 +332,8 @@ public void classFieldArraysNotConflict() { } @Test - public void classFieldArraysAliasingConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentArrayAliasingConflictInterProceduralSample"; + public void arraysAliasingConflict() { + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ArrayAliasingConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{12}, new int[]{13}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -363,7 +363,7 @@ public void arraySameIndexConflict() { @Test public void staticClassFieldNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.StaticClassFieldNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{10}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -373,7 +373,7 @@ public void staticClassFieldNotConflict() { @Test public void staticClassFieldConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentStaticClassFieldConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.StaticClassFieldConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{10}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -383,7 +383,7 @@ public void staticClassFieldConflict() { @Test public void objectFieldConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentObjectFieldConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ObjectFieldConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{7}, new int[]{9}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -393,7 +393,7 @@ public void objectFieldConflict() { @Test public void objectFieldNotConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentObjectFieldNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ObjectFieldNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{8}, new int[]{9}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -403,7 +403,7 @@ public void objectFieldNotConflict() { @Test public void threeDepthObjectsConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ObjectThreeFieldsOneConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{15, 18}, new int[]{16, 19}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -413,7 +413,7 @@ public void threeDepthObjectsConflict() { @Test public void differentAttributeOnIdenticalClass() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.DifferentAttributeOnIdenticalClassNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{13}, new int[]{14}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -423,7 +423,7 @@ public void differentAttributeOnIdenticalClass() { @Test public void differentClassWithSameAttribute() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.DifferentClassWithSameAttributeNotConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{14}, new int[]{15}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -433,7 +433,7 @@ public void differentClassWithSameAttribute() { @Test public void sameAttributeOnIdenticalClass() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.SameAttributeOnIdenticalClassConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{13}, new int[]{14}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -443,7 +443,7 @@ public void sameAttributeOnIdenticalClass() { @Test public void concatMethodsConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentConcatMethodsConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.ConcatMethodsConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{10}, new int[]{11}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -453,7 +453,7 @@ public void concatMethodsConflict() { @Test public void ifBranchConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentIfBranchConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.IfBranchConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{10}, new int[]{11}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -463,7 +463,7 @@ public void ifBranchConflict() { @Test public void sequenceConflict() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentSequenceConflictInterProceduralSample"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.SequenceConflictSample"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{7, 9}, new int[]{8}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); @@ -473,7 +473,7 @@ public void sequenceConflict() { @Test public void sequenceConflict2() { - String sampleClassPath = "br.unb.cic.analysis.samples.ioa.OverridingAssignmentSequenceConflictInterProceduralSample2"; + String sampleClassPath = "br.unb.cic.analysis.samples.ioa.SequenceConflictSample2"; AbstractMergeConflictDefinition definition = DefinitionFactory .definition(sampleClassPath, new int[]{7}, new int[]{8, 9}); InterproceduralOverrideAssignment analysis = new InterproceduralOverrideAssignment(definition); diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentAdditionToArrayConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/AdditionToArrayConflictSample.java similarity index 81% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentAdditionToArrayConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/AdditionToArrayConflictSample.java index 8bbe6dea..9f1b75a8 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentAdditionToArrayConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/AdditionToArrayConflictSample.java @@ -4,7 +4,7 @@ import java.util.List; // Conflict: [left, m():11] --> [right, m():12] -public class OverridingAssignmentAdditionToArrayConflictInterProceduralSample { +public class AdditionToArrayConflictSample { public void m() { List validParameterAnnotations = new ArrayList(); diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArrayAliasingConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayAliasingConflictSample.java similarity index 54% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArrayAliasingConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ArrayAliasingConflictSample.java index f6c1c9bf..d86bbd21 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArrayAliasingConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayAliasingConflictSample.java @@ -1,12 +1,12 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, foo():15] --> [right, bar():19] -public class OverridingAssignmentArrayAliasingConflictInterProceduralSample { +// Conflict: [left, foo():17] --> [right, bar():21] +public class ArrayAliasingConflictSample { private int[] arr, barr; public static void main(String[] args) { - OverridingAssignmentArrayAliasingConflictInterProceduralSample m = - new OverridingAssignmentArrayAliasingConflictInterProceduralSample(); + ArrayAliasingConflictSample m = + new ArrayAliasingConflictSample(); m.arr = new int[]{0, 0, 0, 0, 0}; m.barr = m.arr; m.foo(); // LEFT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayDiferentIndexNotConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayDiferentIndexNotConflictSample.java index c4dfaca3..3e4a46df 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayDiferentIndexNotConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ArrayDiferentIndexNotConflictSample.java @@ -1,5 +1,5 @@ package br.unb.cic.analysis.samples.ioa; - +// Not Conflict public class ArrayDiferentIndexNotConflictSample { private int[] arr; diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/ArraySameIndexConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraySameIndexConflictSample.java index dde0652f..fa7ea53a 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/ArraySameIndexConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraySameIndexConflictSample.java @@ -1,6 +1,6 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, foo():14] --> [right, bar():18] +// Conflict: [left, foo():15] --> [right, bar():19] public class ArraySameIndexConflictSample { private int[] arr; diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldConflictSample.java similarity index 81% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldConflictSample.java index 92790bea..9ea762fd 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Conflict: [left, foo():13] --> [right, bar():17] -public class OverridingAssignmentArraysClassFieldConflictInterProceduralSample { +public class ArraysClassFieldConflictSample { public static int[] y; public static void main(String[] args) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldNotConflictSample.java similarity index 82% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldNotConflictSample.java index 97907d1a..cf78826f 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ArraysClassFieldNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentArraysClassFieldNotConflictInterProceduralSample { +public class ArraysClassFieldNotConflictSample { public static int[] y; public static void main(String[] args) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/BothMarkingConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/BothMarkingConflictSample.java index da66bdca..bc6997f8 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/BothMarkingConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/BothMarkingConflictSample.java @@ -5,10 +5,9 @@ public class BothMarkingConflictSample { private static int x; public void main() { - foo(); + foo(); // LEFT } - private static void foo() { x = 1; // RIGHT } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/CallGraphSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/CallGraphSample.java index 5ab6d074..cb2ed958 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/CallGraphSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/CallGraphSample.java @@ -1,16 +1,20 @@ package br.unb.cic.analysis.samples.ioa; + +// Conflict: [{left, CallGraphClassImplements.baz():43] --> [right, CallGraphClassImplements():38}, +// {left, CallGraphClassImplements():38] --> [right, CallGraphClassImplements.baz():43}] + public class CallGraphSample { private int[] arr; public void m() { - CallGraphInterface callGraphInterface = new CallGraphClassImplements(); - callGraphInterface.baz(); + CallGraphInterface callGraphInterface = new CallGraphClassImplements(); // LEFT + callGraphInterface.baz(); // RIGHT - CallGraphClassImplements callGraphClassImplements = new CallGraphClassImplements(); - callGraphClassImplements.baz(); + CallGraphClassImplements callGraphClassImplements = new CallGraphClassImplements(); // LEFT + callGraphClassImplements.baz(); // RIGHT - CallGraphClass callGraphClass = new CallGraphClass(); - callGraphClass.bar(); + CallGraphClass callGraphClass = new CallGraphClass(); // LEFT + callGraphClass.bar(); // RIGHT foo(); diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ChangeInstanceAttributeConflictSample.java similarity index 57% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ChangeInstanceAttributeConflictSample.java index 2b03a053..3931b9ea 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ChangeInstanceAttributeConflictSample.java @@ -1,12 +1,12 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():17] --> [right, InstanceAttributeSample.setFoo():21] -public class OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample { +// Conflict: [left, InstanceAttributeSample():20] --> [right, InstanceAttributeSample.setFoo():24] +public class ChangeInstanceAttributeConflictSample { private InstanceAttributeSample instanceAttributeSample; public static void main(String[] args) { - OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample m = - new OverridingAssignmentChangeInstanceAttributeConflictInterProceduralSample(); + ChangeInstanceAttributeConflictSample m = + new ChangeInstanceAttributeConflictSample(); m.instanceAttributeSample = new InstanceAttributeSample(); // LEFT m.instanceAttributeSample.setFoo(2); // RIGHT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangePublicAttributesConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ChangePublicAttributesConflictSample.java similarity index 69% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangePublicAttributesConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ChangePublicAttributesConflictSample.java index 4baec368..bb1aa95a 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentChangePublicAttributesConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ChangePublicAttributesConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():9] --> [right, ():19] -public class OverridingAssignmentChangePublicAttributesConflictInterProceduralSample { +// Conflict: [left, m():9] --> [right, Result():19] +public class ChangePublicAttributesConflictSample { public void m() { Result result = new Result(); // LEFT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample.java new file mode 100644 index 00000000..df542d6f --- /dev/null +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample.java @@ -0,0 +1,17 @@ +package br.unb.cic.analysis.samples.ioa; + +// Conflict: [left, main():10] --> [right, foo():15] +public class ClassFieldConflictSample { + private int x; + + public static void main(String[] args) { + ClassFieldConflictSample m = + new ClassFieldConflictSample(); + m.x = 0; // LEFT + m.foo(); // RIGHT + } + + private void foo() { + x = 1; + } +} \ No newline at end of file diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample2.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample2.java new file mode 100644 index 00000000..d0c214cb --- /dev/null +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldConflictSample2.java @@ -0,0 +1,22 @@ +package br.unb.cic.analysis.samples.ioa; + +// Conflict: [left, foo():15] --> [right, bar():19] +public class ClassFieldConflictSample2 { + private int x; + + public static void main(String[] args) { + ClassFieldConflictSample2 m = + new ClassFieldConflictSample2(); + m.foo(); // LEFT + m.bar(); // RIGHT + } + + private void foo() { + x = 0; + } + + private void bar() { + x = 1; + } + +} diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample.java similarity index 77% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample.java index 3a16b3f5..fc57f936 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentClassFieldNotConflictInterProceduralSample { +public class ClassFieldNotConflictSample { private int x; public void m() { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample2.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample2.java similarity index 79% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample2.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample2.java index efd6f796..6d059971 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldNotConflictInterProceduralSample2.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldNotConflictSample2.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentClassFieldNotConflictInterProceduralSample2 { +public class ClassFieldNotConflictSample2 { private int x; public void m() { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldWithParameterNotConflictSample.java similarity index 56% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldWithParameterNotConflictSample.java index a1b9ea10..c7a13609 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ClassFieldWithParameterNotConflictSample.java @@ -2,12 +2,12 @@ // Not Conflict - Not implemented yet. You will need constant propagation. // Currently detected as conflict: [left, m():9] --> [right, foo():14] -public class OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample { +public class ClassFieldWithParameterNotConflictSample { private int x; public static void main(String[] args) { - OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample m = - new OverridingAssignmentClassFieldWithParameterNotConflictInterProceduralSample(); + ClassFieldWithParameterNotConflictSample m = + new ClassFieldWithParameterNotConflictSample(); m.x = 0; // LEFT m.foo(m.x); // RIGHT } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentConcatMethodsConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ConcatMethodsConflictSample.java similarity index 58% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentConcatMethodsConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ConcatMethodsConflictSample.java index 8ccdfbd0..d2eb41b7 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentConcatMethodsConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ConcatMethodsConflictSample.java @@ -1,11 +1,11 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():7] --> [right, foo():8] -public class OverridingAssignmentConcatMethodsConflictInterProceduralSample { +// Conflict: [left, main():10] --> [right, main():11] +public class ConcatMethodsConflictSample { public static void main(String[] args) { - OverridingAssignmentConcatMethodsConflictInterProceduralSample m = - new OverridingAssignmentConcatMethodsConflictInterProceduralSample(); + ConcatMethodsConflictSample m = + new ConcatMethodsConflictSample(); int x = m.foo() + m.bar(); // LEFT i3 = $i0 + $i1 - x = $stack2 + $stack3 x = x + m.qux(); // RIGHT i4 = i3 + $i2 - x = x + $stack4 diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/ContainsInvokeExpConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ContainsInvokeExpConflictSample.java index 0ebbc50d..52415923 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/ContainsInvokeExpConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ContainsInvokeExpConflictSample.java @@ -4,10 +4,12 @@ public class ContainsInvokeExpConflictSample { private int x, y; - public void m() { - x = 0; // LEFT - y = 0; - x = foo(); // RIGHT + public static void main() { + ContainsInvokeExpConflictSample m = new ContainsInvokeExpConflictSample(); + + m.x = 0; // LEFT + m.y = 0; + m.x = m.foo(); // RIGHT } private int foo() { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentAttributeOnIdenticalClassNotConflictSample.java similarity index 71% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/DifferentAttributeOnIdenticalClassNotConflictSample.java index ede6bd30..06dec7da 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentAttributeOnIdenticalClassNotConflictSample.java @@ -1,10 +1,10 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample { +public class DifferentAttributeOnIdenticalClassNotConflictSample { private ObjectSample objectSample1, objectSample2; - public OverridingAssignmentDifferentAttributeOnIdenticalClassNotConflictInterProceduralSample() { + public DifferentAttributeOnIdenticalClassNotConflictSample() { objectSample1 = new ObjectSample(); objectSample2 = new ObjectSample(); } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentClassWithSameAttributeNotConflictSample.java similarity index 74% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/DifferentClassWithSameAttributeNotConflictSample.java index c3444b92..4cd69040 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentClassWithSameAttributeNotConflictSample.java @@ -1,11 +1,11 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample { +public class DifferentClassWithSameAttributeNotConflictSample { private ObjectExample objectExample; private ObjectExample2 objectExample2; - public OverridingAssignmentDifferentClassWithSameAttributeNotConflictInterProceduralSample() { + public DifferentClassWithSameAttributeNotConflictSample() { objectExample = new ObjectExample(); objectExample2 = new ObjectExample2(); } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentMethodOnIdenticalClassConflictSample.java similarity index 67% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/DifferentMethodOnIdenticalClassConflictSample.java index 376f63e9..65c3a31c 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/DifferentMethodOnIdenticalClassConflictSample.java @@ -1,12 +1,12 @@ package br.unb.cic.analysis.samples.ioa; // Conflict: [left, IdenticalClassSample.setFoo():25] --> [right, IdenticalClassSample.setBar():21] -public class OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample { +public class DifferentMethodOnIdenticalClassConflictSample { private IdenticalClassSample identicalClassSample; public static void main(String[] args) { - OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample m = - new OverridingAssignmentDifferentMethodOnIdenticalClassConflictInterProceduralSample(); + DifferentMethodOnIdenticalClassConflictSample m = + new DifferentMethodOnIdenticalClassConflictSample(); m.identicalClassSample = new IdenticalClassSample(); m.identicalClassSample.setFoo(1); // LEFT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentHashmapConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/HashmapConflictSample.java similarity index 81% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentHashmapConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/HashmapConflictSample.java index d84330f3..84004e4e 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentHashmapConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/HashmapConflictSample.java @@ -4,7 +4,7 @@ import java.util.Map; // Conflict: [left, m():13] --> [right, m():14] -public class OverridingAssignmentHashmapConflictInterProceduralSample { +public class HashmapConflictSample { public void m() { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentIfBranchConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/IfBranchConflictSample.java similarity index 53% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentIfBranchConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/IfBranchConflictSample.java index 5c1abede..95fa2211 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentIfBranchConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/IfBranchConflictSample.java @@ -1,12 +1,12 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():8] --> [right, foo():14] -public class OverridingAssignmentIfBranchConflictInterProceduralSample { +// Conflict: [left, main():10] --> [right, foo():16] +public class IfBranchConflictSample { private int x; public static void main() { - OverridingAssignmentIfBranchConflictInterProceduralSample m = - new OverridingAssignmentIfBranchConflictInterProceduralSample(); + IfBranchConflictSample m = + new IfBranchConflictSample(); m.x = 0; // LEFT m.foo(); // RIGHT } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/IfWithInvokeConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/IfWithInvokeConflictSample.java index 0bbbada2..d806a343 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/IfWithInvokeConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/IfWithInvokeConflictSample.java @@ -1,11 +1,12 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():8] --> [right, foo():16] +// Conflict: [left, main():10] --> [right, foo():18] public class IfWithInvokeConflictSample { private int x, y; public static void main(String[] args) { IfWithInvokeConflictSample m = new IfWithInvokeConflictSample(); + m.x = 0; // LEFT m.y = 0; if (m.foo()) { // RIGHT @@ -17,6 +18,4 @@ private boolean foo() { x = 1; return true; } - - } \ No newline at end of file diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayNotConflictSample.java similarity index 76% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayNotConflictSample.java index 123118bc..749f3dcf 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentLocalArrayNotConflictInterProceduralSample { +public class LocalArrayNotConflictSample { public void m() { foo(); // LEFT bar(); // RIGHT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayRecursiveNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayRecursiveNotConflictSample.java similarity index 75% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayRecursiveNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayRecursiveNotConflictSample.java index a950ad3b..e57b3cdc 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalArrayRecursiveNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalArrayRecursiveNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentLocalArrayRecursiveNotConflictInterProceduralSample { +public class LocalArrayRecursiveNotConflictSample { public void m() { foo(); // LEFT bar(); // RIGHT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample.java similarity index 74% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample.java index bbfc3d4f..b4033013 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentLocalVariablesNotConflictInterProceduralSample { +public class LocalVariablesNotConflictSample { public void m() { foo(); // LEFT bar(); // RIGHT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2.java b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample2.java similarity index 60% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample2.java index 96081945..38c0a2b5 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesNotConflictSample2.java @@ -1,9 +1,9 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentLocalVariablesNotConflictInterProceduralSample2 { +public class LocalVariablesNotConflictSample2 { public void m() { - int x = 0; // LEFT + int x = 0; // LEFT foo(x); // RIGHT } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesWithParameterNotConflictSample.java similarity index 72% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesWithParameterNotConflictSample.java index 52ede95d..bd446373 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/LocalVariablesWithParameterNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentLocalVariablesWithParameterNotConflictInterProceduralSample { +public class LocalVariablesWithParameterNotConflictSample { public void m() { foo(0); // LEFT bar(1); // RIGHT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldConflictSample.java similarity index 69% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldConflictSample.java index ba9eb365..882364b4 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, ObjectFieldConflict.m():17] --> [right, ObjectFieldConflict.bar():21] -public class OverridingAssignmentObjectFieldConflictInterProceduralSample { +// Conflict: [left, ObjectFieldConflict.foo():17] --> [right, ObjectFieldConflict.bar():21] +public class ObjectFieldConflictSample { public void m() { ObjectFieldConflict c = new ObjectFieldConflict(); c.foo(1); // left diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldNotConflictSample.java similarity index 86% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldNotConflictSample.java index 52b8d6ec..e38cf075 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectFieldNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectFieldNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentObjectFieldNotConflictInterProceduralSample { +public class ObjectFieldNotConflictSample { public void m() { ObjectFieldNotConflict objectFieldNotConflict = new ObjectFieldNotConflict(); objectFieldNotConflict.foo(1); // left diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectThreeFieldsOneConflictSample.java similarity index 71% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/ObjectThreeFieldsOneConflictSample.java index e724772d..e3d5fb7f 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/ObjectThreeFieldsOneConflictSample.java @@ -2,15 +2,15 @@ import br.unb.cic.analysis.samples.OverridingAssignmentInstance2; -// Conflict: [left, baz():33] --> [right, bar():29] -public class OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample { +// Conflict: [left, baz():35] --> [right, bar():31] +public class ObjectThreeFieldsOneConflictSample { public OverridingAssignmentInstance2 a; public OverridingAssignmentInstance2 b; - public static OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample instanceLocal; + public static ObjectThreeFieldsOneConflictSample instanceLocal; public static void main(String[] args) { - instanceLocal = new OverridingAssignmentObjectThreeFieldsOneConflictInterProceduralSample(); + instanceLocal = new ObjectThreeFieldsOneConflictSample(); instanceLocal.foo(); // left instanceLocal.bar(); // right in {instanceLocal.b.a.a, instanceLocal.b.a.b } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample.java deleted file mode 100644 index e7d4d0e3..00000000 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample.java +++ /dev/null @@ -1,17 +0,0 @@ -package br.unb.cic.analysis.samples.ioa; - -// Conflict: [left, m():8] --> [right, foo():13] -public class OverridingAssignmentClassFieldConflictInterProceduralSample { - private int x; - - public static void main(String[] args) { - OverridingAssignmentClassFieldConflictInterProceduralSample m = - new OverridingAssignmentClassFieldConflictInterProceduralSample(); - m.x = 0; // LEFT - m.foo(); // RIGHT - } - - private void foo() { - x = 1; - } -} \ No newline at end of file diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample2.java b/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample2.java deleted file mode 100644 index c5e5ba75..00000000 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentClassFieldConflictInterProceduralSample2.java +++ /dev/null @@ -1,22 +0,0 @@ -package br.unb.cic.analysis.samples.ioa; - -// Conflict: [left, foo():13] --> [right, bar():17] -public class OverridingAssignmentClassFieldConflictInterProceduralSample2 { - private int x; - - public static void main(String[] args) { - OverridingAssignmentClassFieldConflictInterProceduralSample2 m = - new OverridingAssignmentClassFieldConflictInterProceduralSample2(); - m.foo(); // LEFT - m.bar(); // RIGHT - } - - private void foo() { - x = 0; - } - - private void bar() { - x = 1; - } - -} diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveCallConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveCallConflictSample.java index 0e3dd70c..6a801f02 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveCallConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveCallConflictSample.java @@ -1,6 +1,6 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, foo():13] --> [right, foo():13] +// Conflict: [left, foo():15] --> [right, foo():15] public class RecursiveCallConflictSample { public static void main(String[] args) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupConflictSample.java index 97907ed9..d8321893 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupConflictSample.java @@ -1,6 +1,6 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, foo():13] --> [right, foo():13] +// Conflict: [{left, foo():14] --> [right, foo():14}, {left, foo():14] --> [right, foo():14}, {left, foo():14] --> [right, foo():14}] public class RecursiveMockupConflictSample { private int x; diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupNotConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupNotConflictSample.java index a61f341b..716f80fb 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupNotConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/RecursiveMockupNotConflictSample.java @@ -1,5 +1,5 @@ package br.unb.cic.analysis.samples.ioa; - +// Not Conflict public class RecursiveMockupNotConflictSample { private int x; diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/SameAttributeOnIdenticalClassConflictSample.java similarity index 58% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/SameAttributeOnIdenticalClassConflictSample.java index 36949fbd..269fe026 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/SameAttributeOnIdenticalClassConflictSample.java @@ -1,10 +1,10 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [left, m():12] --> [right, foo():13] -public class OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample { +// Not Conflict +public class SameAttributeOnIdenticalClassConflictSample { private TestObject testObject; - public OverridingAssignmentSameAttributeOnIdenticalClassConflictInterProceduralSample() { + public SameAttributeOnIdenticalClassConflictSample() { testObject = new TestObject(); } diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample2.java b/src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample.java similarity index 73% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample2.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample.java index c686ec50..793f7d65 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample2.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Conflict: [{left, m():7 --> right, m():8}] -public class OverridingAssignmentSequenceConflictInterProceduralSample2 { +public class SequenceConflictSample { public void m() { int x = 0; // LEFT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample2.java similarity index 50% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample2.java index 959675c0..87a8a6b5 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentSequenceConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/SequenceConflictSample2.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; -// Conflict: [{left, m():7 --> right, m():8}, {left, m():9 --> right, m():8}] -public class OverridingAssignmentSequenceConflictInterProceduralSample { +// Conflict: [{left, m():7 --> right, m():8}] +public class SequenceConflictSample2 { public void m() { int x = 0; // LEFT diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldConflictSample.java similarity index 84% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldConflictSample.java index 11a0ac8e..a8047b11 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Conflict: [left, foo():14] --> [right, bar():22] -public class OverridingAssignmentStaticClassFieldConflictInterProceduralSample { +public class StaticClassFieldConflictSample { public static int y; public static void main(String[] args) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldNotConflictSample.java similarity index 82% rename from src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample.java rename to src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldNotConflictSample.java index 5b0d3df7..c9c7860e 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/StaticClassFieldNotConflictSample.java @@ -1,7 +1,7 @@ package br.unb.cic.analysis.samples.ioa; // Not Conflict -public class OverridingAssignmentStaticClassFieldNotConflictInterProceduralSample { +public class StaticClassFieldNotConflictSample { public static int y; public static void main(String[] args) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassConflictSample.java index 37710291..7ac2b0c1 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassConflictSample.java @@ -1,5 +1,5 @@ package br.unb.cic.analysis.samples.ioa; - +// Not Conflict public class SubclassConflictSample { public static void m(A a) { diff --git a/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassWithConditionalNotConflictSample.java b/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassWithConditionalNotConflictSample.java index f542cbf1..c1025deb 100644 --- a/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassWithConditionalNotConflictSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/ioa/SubclassWithConditionalNotConflictSample.java @@ -1,5 +1,5 @@ package br.unb.cic.analysis.samples.ioa; - +// Not Conflict public class SubclassWithConditionalNotConflictSample { private static C c;