forked from kordamp/naum
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
153 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
subprojects/naum-core/src/main/resources/org/kordamp/naum/diff/Messages.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Class | ||
| class.version.modified=Class version of {0} changed from {1} to {2} | ||
| class.superclass.modified=Superclass of {0} changed from {1} to {2} | ||
| class.interface.removed=Interface {1} was removed from {0} | ||
| class.interface.added=Interface {1} was added to {0} | ||
| class.innerclass.removed=Inner class {1} was removed from {0} | ||
| class.innerclass.added=Inner class {1} was added to {0} | ||
| class.modifiers.modified=Modifiers of class {0} changed from {1} ({2}) to {3} ({4}) | ||
| # Field | ||
| field.modifiers.modified=Modifiers of field {0} changed from {1} ({2}) to {3} ({4}) | ||
| field.type.modified=Type of field {0} changed from {1} to {2} | ||
| # Constructor | ||
| constructor.exception.removed=Exception {0} removed from throws clause of constructor | ||
| constructor.exception.added=Exception {0} added to throws clause of constructor | ||
| constructor.modifiers.modified=Modifiers of constructor for class {0} changed from {1} ({2}) to {3} ({4}) | ||
| # Method | ||
| method.type.modified=Type of method {0} changed from {1} to {2} | ||
| method.exception.removed=Exception {1} removed from throws clause of method {0} | ||
| method.exception.added=Exception {1} added to throws clause of method {0} | ||
| method.modifiers.modified=Modifiers of method {0} changed from {1} ({2}) to {3} ({4}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
subprojects/naum-core/src/test/java/org/kordamp/naum/diff/FieldDifferTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright 2016 the original author or authors. | ||
| * | ||
| * 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. | ||
| */ | ||
| package org.kordamp.naum.diff; | ||
|
|
||
| import junitparams.JUnitParamsRunner; | ||
| import junitparams.Parameters; | ||
| import junitparams.naming.TestCaseName; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.kordamp.naum.model.ClassInfo; | ||
| import org.kordamp.naum.model.FieldInfo; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| import static java.util.Arrays.asList; | ||
| import static org.hamcrest.CoreMatchers.equalTo; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.greaterThan; | ||
| import static org.hamcrest.collection.IsCollectionWithSize.hasSize; | ||
| import static org.kordamp.naum.diff.ClassDiffer.KEY_CLASS_SUPERCLASS_MODIFIED; | ||
| import static org.kordamp.naum.diff.FieldDiffer.KEY_FIELD_MODIFIERS_MODIFIED; | ||
| import static org.kordamp.naum.diff.FieldDiffer.KEY_FIELD_TYPE_MODIFIED; | ||
| import static org.kordamp.naum.diff.FieldDiffer.fieldDiffer; | ||
| import static org.objectweb.asm.Opcodes.ACC_PRIVATE; | ||
| import static org.objectweb.asm.Opcodes.ACC_PUBLIC; | ||
|
|
||
| /** | ||
| * @author Andres Almiray | ||
| */ | ||
| @RunWith(JUnitParamsRunner.class) | ||
| public class FieldDifferTest { | ||
| private static final String FIELDNAME = "var"; | ||
| private static final String JAVA_LANG_OBJECT = "java.lang.Object"; | ||
| private static final String JAVA_LANG_INTEGER = "java.lang.Integer"; | ||
|
|
||
| @Test | ||
| @Parameters(method = "parameters") | ||
| @TestCaseName("{method}[{index}] - {0}") | ||
| public void fieldsDiffer(String testName, FieldInfo previous, FieldInfo next, Collection<Diff> expected) { | ||
| FieldDiffer differ = fieldDiffer(previous, next); | ||
| Collection<Diff> actual = differ.diff(); | ||
| assertThat(actual, hasSize(greaterThan(0))); | ||
| assertThat(actual, equalTo(expected)); | ||
| } | ||
|
|
||
| private Object[] parameters() { | ||
| return new Object[]{ | ||
| new Object[]{ | ||
| "modifiers", | ||
| FieldInfo.builder() | ||
| .name(FIELDNAME) | ||
| .modifiers(ACC_PUBLIC) | ||
| .type(JAVA_LANG_OBJECT) | ||
| .build(), | ||
| FieldInfo.builder() | ||
| .name(FIELDNAME) | ||
| .modifiers(ACC_PRIVATE) | ||
| .type(JAVA_LANG_OBJECT) | ||
| .build(), | ||
| asList( | ||
| Diff.builder() | ||
| .severity(Diff.Severity.ERROR) | ||
| .type(Diff.Type.MODIFIED) | ||
| .messageKey(KEY_FIELD_MODIFIERS_MODIFIED) | ||
| .messageArg(FIELDNAME) | ||
| .messageArg("public") | ||
| .messageArg(ACC_PUBLIC) | ||
| .messageArg("private") | ||
| .messageArg(ACC_PRIVATE) | ||
| .build() | ||
| ) | ||
| }, | ||
|
|
||
| new Object[]{ | ||
| "type", | ||
| FieldInfo.builder() | ||
| .name(FIELDNAME) | ||
| .type(JAVA_LANG_OBJECT) | ||
| .build(), | ||
| FieldInfo.builder() | ||
| .name(FIELDNAME) | ||
| .type(JAVA_LANG_INTEGER) | ||
| .build(), | ||
| asList( | ||
| Diff.builder() | ||
| .severity(Diff.Severity.ERROR) | ||
| .type(Diff.Type.MODIFIED) | ||
| .messageKey(KEY_FIELD_TYPE_MODIFIED) | ||
| .messageArg(FIELDNAME) | ||
| .messageArg(JAVA_LANG_OBJECT) | ||
| .messageArg(JAVA_LANG_INTEGER) | ||
| .build() | ||
| ) | ||
| }, | ||
| }; | ||
| } | ||
| } |