From b565e2372d2f3918622cd4be985cbaa0952600c3 Mon Sep 17 00:00:00 2001 From: errenkoc Date: Sun, 1 Apr 2018 23:57:28 +0300 Subject: [PATCH 1/4] Final --- .../unittest/MethodRenamingTest.java | 51 +++++++++++++++++++ .../RemovingClassDerivabilityTest.java | 51 +++++++++++++++++++ .../RemovingMethodOverridabilityTest.java | 51 +++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java create mode 100644 src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java create mode 100644 src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java new file mode 100644 index 0000000..839792a --- /dev/null +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java @@ -0,0 +1,51 @@ +package ch.uzh.ifi.seal.changedistiller.unittest; + +/* + * #%L + * ChangeDistiller + * %% + * Copyright (C) 2011 - 2018 Software Architecture and Evolution Lab, Department of Informatics, UZH + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +import static org.junit.Assert.assertEquals; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import ch.uzh.ifi.seal.changedistiller.model.entities.SourceCodeChange; + +public class MethodRenamingTest { + List sourceCodeChangeList; + + @Before + public void setUp() { + sourceCodeChangeList = FileDistillerUtil.getChangesFromFile("MethodRenaming_Left.java", "MethodRenaming_Right.java"); + } + + @Test + public void classRenamingTest() { + String expected = "METHOD_RENAMING\n"; + + StringBuilder stringBuilder = new StringBuilder(); + for(SourceCodeChange change : sourceCodeChangeList) { + stringBuilder.append(change.getLabel() + "\n"); + } + + assertEquals(stringBuilder.toString(), expected); + } +} diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java new file mode 100644 index 0000000..d93d306 --- /dev/null +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java @@ -0,0 +1,51 @@ +package ch.uzh.ifi.seal.changedistiller.unittest; + +/* + * #%L + * ChangeDistiller + * %% + * Copyright (C) 2011 - 2018 Software Architecture and Evolution Lab, Department of Informatics, UZH + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +import static org.junit.Assert.assertEquals; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import ch.uzh.ifi.seal.changedistiller.model.entities.SourceCodeChange; + +public class RemovingClassDerivabilityTest { + List sourceCodeChangeList; + + @Before + public void setUp() { + sourceCodeChangeList = FileDistillerUtil.getChangesFromFile("RemovingClassDerivability_Left.java", "RemovingClassDerivability_Right.java"); + } + + @Test + public void classRenamingTest() { + String expected = "REMOVING_CLASS_DERIVABILITY\n"; + + StringBuilder stringBuilder = new StringBuilder(); + for(SourceCodeChange change : sourceCodeChangeList) { + stringBuilder.append(change.getLabel() + "\n"); + } + + assertEquals(stringBuilder.toString(), expected); + } +} diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java new file mode 100644 index 0000000..f48f004 --- /dev/null +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java @@ -0,0 +1,51 @@ +package ch.uzh.ifi.seal.changedistiller.unittest; + +/* + * #%L + * ChangeDistiller + * %% + * Copyright (C) 2011 - 2018 Software Architecture and Evolution Lab, Department of Informatics, UZH + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + +import static org.junit.Assert.assertEquals; + +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + +import ch.uzh.ifi.seal.changedistiller.model.entities.SourceCodeChange; + +public class RemovingMethodOverridabilityTest { + List sourceCodeChangeList; + + @Before + public void setUp() { + sourceCodeChangeList = FileDistillerUtil.getChangesFromFile("RemovingMethodOverridability_Left.java", "RemovingMethodOverridability_Right.java"); + } + + @Test + public void classRenamingTest() { + String expected = "REMOVING_METHOD_OVERRIDABILITY\n"; + + StringBuilder stringBuilder = new StringBuilder(); + for(SourceCodeChange change : sourceCodeChangeList) { + stringBuilder.append(change.getLabel() + "\n"); + } + + assertEquals(stringBuilder.toString(), expected); + } +} From 1ac26f6c42e355097d9eadf74bed814295b2b1a8 Mon Sep 17 00:00:00 2001 From: errenkoc Date: Sun, 1 Apr 2018 23:58:36 +0300 Subject: [PATCH 2/4] Final classes --- .../testdata/src_changetypes/MethodRenaming_Left.java | 8 ++++++++ .../testdata/src_changetypes/MethodRenaming_Right.java | 8 ++++++++ .../src_changetypes/RemovingClassDerivability_Left.java | 8 ++++++++ .../src_changetypes/RemovingClassDerivability_Right.java | 8 ++++++++ .../RemovingMethodOverridability_Left.java | 8 ++++++++ .../RemovingMethodOverridability_Right.java | 8 ++++++++ 6 files changed, 48 insertions(+) create mode 100644 resources/testdata/src_changetypes/MethodRenaming_Left.java create mode 100644 resources/testdata/src_changetypes/MethodRenaming_Right.java create mode 100644 resources/testdata/src_changetypes/RemovingClassDerivability_Left.java create mode 100644 resources/testdata/src_changetypes/RemovingClassDerivability_Right.java create mode 100644 resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java create mode 100644 resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java diff --git a/resources/testdata/src_changetypes/MethodRenaming_Left.java b/resources/testdata/src_changetypes/MethodRenaming_Left.java new file mode 100644 index 0000000..8da19cf --- /dev/null +++ b/resources/testdata/src_changetypes/MethodRenaming_Left.java @@ -0,0 +1,8 @@ +package test; +public class Test { + + public void method1(){ + + } + +} diff --git a/resources/testdata/src_changetypes/MethodRenaming_Right.java b/resources/testdata/src_changetypes/MethodRenaming_Right.java new file mode 100644 index 0000000..7ed8057 --- /dev/null +++ b/resources/testdata/src_changetypes/MethodRenaming_Right.java @@ -0,0 +1,8 @@ +package test; +public class Test { + + public void method2(){ + + } + +} diff --git a/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java b/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java new file mode 100644 index 0000000..63de917 --- /dev/null +++ b/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java @@ -0,0 +1,8 @@ +package test; +public class Test { + + public void method(){ + + } + +} diff --git a/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java b/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java new file mode 100644 index 0000000..00426e2 --- /dev/null +++ b/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java @@ -0,0 +1,8 @@ +package test; +public final class Test { + + public void method(){ + + } + +} diff --git a/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java b/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java new file mode 100644 index 0000000..63de917 --- /dev/null +++ b/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java @@ -0,0 +1,8 @@ +package test; +public class Test { + + public void method(){ + + } + +} diff --git a/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java b/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java new file mode 100644 index 0000000..2c29700 --- /dev/null +++ b/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java @@ -0,0 +1,8 @@ +package test; +public class Test { + + public static void method(){ + + } + +} From 49bc358a181147622786f040e2367a2ea3b0a449 Mon Sep 17 00:00:00 2001 From: errenkoc Date: Mon, 2 Apr 2018 14:53:44 +0300 Subject: [PATCH 3/4] corrected test names --- .../ifi/seal/changedistiller/unittest/MethodRenamingTest.java | 2 +- .../changedistiller/unittest/RemovingClassDerivabilityTest.java | 2 +- .../unittest/RemovingMethodOverridabilityTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java index 839792a..11ebf0c 100644 --- a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/MethodRenamingTest.java @@ -38,7 +38,7 @@ public void setUp() { } @Test - public void classRenamingTest() { + public void methodRenamingTest() { String expected = "METHOD_RENAMING\n"; StringBuilder stringBuilder = new StringBuilder(); diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java index d93d306..0e733b3 100644 --- a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingClassDerivabilityTest.java @@ -38,7 +38,7 @@ public void setUp() { } @Test - public void classRenamingTest() { + public void removingClassDerivabilityTest() { String expected = "REMOVING_CLASS_DERIVABILITY\n"; StringBuilder stringBuilder = new StringBuilder(); diff --git a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java index f48f004..f9f7dbe 100644 --- a/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java +++ b/src/test/java/ch/uzh/ifi/seal/changedistiller/unittest/RemovingMethodOverridabilityTest.java @@ -38,7 +38,7 @@ public void setUp() { } @Test - public void classRenamingTest() { + public void removingMethodOverridabilityTest() { String expected = "REMOVING_METHOD_OVERRIDABILITY\n"; StringBuilder stringBuilder = new StringBuilder(); From 77332c309d524e9c0c97e0bbefaedb2339d1aa5c Mon Sep 17 00:00:00 2001 From: errenkoc Date: Mon, 2 Apr 2018 14:55:25 +0300 Subject: [PATCH 4/4] Method names an comments updated --- resources/testdata/src_changetypes/MethodRenaming_Left.java | 2 +- resources/testdata/src_changetypes/MethodRenaming_Right.java | 2 +- .../src_changetypes/RemovingClassDerivability_Left.java | 2 +- .../src_changetypes/RemovingClassDerivability_Right.java | 4 ++-- .../src_changetypes/RemovingMethodOverridability_Left.java | 2 +- .../src_changetypes/RemovingMethodOverridability_Right.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/testdata/src_changetypes/MethodRenaming_Left.java b/resources/testdata/src_changetypes/MethodRenaming_Left.java index 8da19cf..64d683a 100644 --- a/resources/testdata/src_changetypes/MethodRenaming_Left.java +++ b/resources/testdata/src_changetypes/MethodRenaming_Left.java @@ -1,7 +1,7 @@ package test; public class Test { - public void method1(){ + public void MethodtoChangeName(){ } diff --git a/resources/testdata/src_changetypes/MethodRenaming_Right.java b/resources/testdata/src_changetypes/MethodRenaming_Right.java index 7ed8057..31e29cb 100644 --- a/resources/testdata/src_changetypes/MethodRenaming_Right.java +++ b/resources/testdata/src_changetypes/MethodRenaming_Right.java @@ -1,7 +1,7 @@ package test; public class Test { - public void method2(){ + public void MethodNameChanged(){ } diff --git a/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java b/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java index 63de917..68d0951 100644 --- a/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java +++ b/resources/testdata/src_changetypes/RemovingClassDerivability_Left.java @@ -1,7 +1,7 @@ package test; public class Test { - public void method(){ + public void DerivableClassCh(){ //this class is derivable } diff --git a/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java b/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java index 00426e2..9d45906 100644 --- a/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java +++ b/resources/testdata/src_changetypes/RemovingClassDerivability_Right.java @@ -1,7 +1,7 @@ package test; -public final class Test { +public final class Test { //final makes it imossible to be extended by a subclass - public void method(){ + public void DerivableClassCh(){ //this class isn't derivable } diff --git a/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java b/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java index 63de917..01b1e5b 100644 --- a/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java +++ b/resources/testdata/src_changetypes/RemovingMethodOverridability_Left.java @@ -1,7 +1,7 @@ package test; public class Test { - public void method(){ + public void OverridableMethodCh(){ //This method is overridable } diff --git a/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java b/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java index 2c29700..88923c0 100644 --- a/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java +++ b/resources/testdata/src_changetypes/RemovingMethodOverridability_Right.java @@ -1,7 +1,7 @@ package test; public class Test { - public static void method(){ + public static void OverridableMethodCh(){ //Making method static disables its overridability }