Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade xtext dependency to 2.26.0.M2 (prerelease). #108

Merged
merged 1 commit into from
Jan 18, 2022
Merged

Upgrade xtext dependency to 2.26.0.M2 (prerelease). #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ subprojects {
'mockito': '2.27.0',
'requirejs': '2.3.6',
'slf4j': '1.7.21',
'xtext': '2.17.0',
'xtext': '2.26.0.M2',
'guava': '29.0-jre'
]
}
Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -37,9 +34,6 @@
@ExtendWith(MockitoExtension.class)
public class MetafixBindTest {

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import com.google.common.collect.ImmutableMap;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -37,9 +34,6 @@
@ExtendWith(MockitoExtension.class)
public class MetafixIfTest {

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -42,9 +39,6 @@ public class MetafixLookupTest {
private static final String CSV_MAP = "src/test/resources/org/metafacture/metafix/maps/test.csv";
private static final String TSV_MAP = "src/test/resources/org/metafacture/metafix/maps/test.tsv";

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -40,9 +37,6 @@
@ExtendWith(MockitoExtension.class)
public class MetafixMethodTest {

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -40,9 +37,6 @@
@ExtendWith(MockitoExtension.class)
public class MetafixRecordTest {

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down
6 changes: 0 additions & 6 deletions metafix/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.Arrays;
Expand All @@ -39,9 +36,6 @@
@Disabled("TODO: support Fix-style selectors https://github.com/LibreCat/Catmandu/wiki/Selectors")
public final class MetafixSelectorTest {

@RegisterExtension
private MockitoRule mockitoRule = MockitoJUnit.rule();

@Mock
private StreamReceiver streamReceiver;

Expand Down