From b5667df1739a7805bcd23bbffb4ee50eb86f7989 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 22 Oct 2020 14:17:15 +0200 Subject: [PATCH] Minimize surefire overrides We just need Mockito to be able to pick up our mocks, for which we can just increase their visibility. Change-Id: I262181dc7e4d251666bfbb6554c7c184ba513400 Signed-off-by: Robert Varga --- yang/yang-model-api/pom.xml | 20 ------------------- .../model/api/meta/DeclaredStatementTest.java | 6 +++--- .../api/meta/EffectiveStatementTest.java | 8 ++++---- ...onStatementAwareDeclaredStatementTest.java | 6 +++--- .../repo/spi/PotentialSchemaSourceTest.java | 6 +++--- yang/yang-model-util/pom.xml | 16 --------------- .../util/FilesystemSchemaSourceCacheTest.java | 8 ++++---- .../util/InMemorySchemaSourceCacheTest.java | 11 +++++----- .../repo/util/RefcountedRegistrationTest.java | 2 +- .../util/SchemaSourceTransformerTest.java | 14 ++++++------- .../yang/model/util/BitsTypeTest.java | 2 +- .../model/util/ModuleDependencySortTest.java | 12 +++++------ .../model/util/SchemaContextUtilTest.java | 10 +++++----- .../yang/model/util/SchemaNodeUtilsTest.java | 2 +- yang/yang-parser-rfc7950/pom.xml | 8 -------- .../stmt/path/PathExpressionParserTest.java | 7 ++++--- yang/yang-parser-spi/pom.xml | 12 ----------- .../spi/source/SourceExceptionTest.java | 2 +- 18 files changed, 48 insertions(+), 104 deletions(-) diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 352cf65aaa..56337c1a10 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -39,24 +39,4 @@ guava - - - - - maven-surefire-plugin - - @{argLine} - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.api=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.api.meta=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.api.stmt=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.api.stmt.compat=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.api.type=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.repo.api=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.api/org.opendaylight.yangtools.yang.model.repo.spi=ALL-UNNAMED - - - - - - diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java index 8dea691e90..747cc1a4d4 100644 --- a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java +++ b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/DeclaredStatementTest.java @@ -23,11 +23,11 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class DeclaredStatementTest { @Mock - private DeclaredStatement1 stmt; + public DeclaredStatement1 stmt; @Mock - private DeclaredStatement1 stmt1; + public DeclaredStatement1 stmt1; @Mock - private DeclaredStatement2 stmt2; + public DeclaredStatement2 stmt2; @Before public void before() { diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java index dbcf36fb0f..054da31a30 100644 --- a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java +++ b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/meta/EffectiveStatementTest.java @@ -25,13 +25,13 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class EffectiveStatementTest { @Mock - private EffectiveStatement1 stmt; + public EffectiveStatement1 stmt; @Mock - private EffectiveStatement1 stmt1; + public EffectiveStatement1 stmt1; @Mock - private Effectivestatement2 stmt2; + public Effectivestatement2 stmt2; @Mock - private Map mockNamespace; + public Map mockNamespace; @Before public void before() { diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java index 5d9bf85129..b9a4ee7df3 100644 --- a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java +++ b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/api/stmt/ActionStatementAwareDeclaredStatementTest.java @@ -23,11 +23,11 @@ import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement1; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class ActionStatementAwareDeclaredStatementTest { @Mock - ActionStatementAwareDeclaredStatement stmt; + public ActionStatementAwareDeclaredStatement stmt; @Mock - private DeclaredStatement1 stmt1; + public DeclaredStatement1 stmt1; @Mock - private ActionStatement stmt2; + public ActionStatement stmt2; @Before public void before() { diff --git a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSourceTest.java b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSourceTest.java index ed4e25075e..26236f26e0 100644 --- a/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSourceTest.java +++ b/yang/yang-model-api/src/test/java/org/opendaylight/yangtools/yang/model/repo/spi/PotentialSchemaSourceTest.java @@ -28,9 +28,9 @@ public class PotentialSchemaSourceTest { } @Mock - private SourceIdentifier sourceIdentifier; - private PotentialSchemaSource source; - private PotentialSchemaSource same; + public SourceIdentifier sourceIdentifier; + public PotentialSchemaSource source; + public PotentialSchemaSource same; @Before public void before() { diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index c229dd4297..a6fee63db1 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -42,20 +42,4 @@ test - - - - - maven-surefire-plugin - - @{argLine} - --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.util=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.util.type=ALL-UNNAMED - --add-opens org.opendaylight.yangtools.yang.model.util/org.opendaylight.yangtools.yang.model.repo.util=ALL-UNNAMED - - - - - - diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java index 99478171b3..538b809444 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java @@ -50,12 +50,12 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class FilesystemSchemaSourceCacheTest { - @Mock - private SchemaSourceRegistry registry; + public SchemaSourceRegistry registry; @Mock - private SchemaSourceRegistration registration; - private File storageDir; + public SchemaSourceRegistration registration; + + public File storageDir; @Before public void setUp() throws Exception { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java index 40129a7f6c..0e59fb0723 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java @@ -40,15 +40,14 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class InMemorySchemaSourceCacheTest { - - private static final Class REPRESENTATION = YangSchemaSourceRepresentation.class; - private static final long LIFETIME = 1000L; - private static final TimeUnit UNITS = TimeUnit.MILLISECONDS; + public static final Class REPRESENTATION = YangSchemaSourceRepresentation.class; + public static final long LIFETIME = 1000L; + public static final TimeUnit UNITS = TimeUnit.MILLISECONDS; @Mock - private SchemaSourceRegistry registry; + public SchemaSourceRegistry registry; @Mock - private SchemaSourceRegistration registration; + public SchemaSourceRegistration registration; @Before public void setUp() throws Exception { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java index df0de0ca49..7762797528 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/RefcountedRegistrationTest.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistration; @RunWith(MockitoJUnitRunner.class) public class RefcountedRegistrationTest { @Mock - private SchemaSourceRegistration reg; + public SchemaSourceRegistration reg; @Before public void before() { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java index 1abd85be33..6fa740ee19 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java @@ -36,19 +36,19 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; @RunWith(MockitoJUnitRunner.class) public class SchemaSourceTransformerTest { - - private SchemaSourceTransformer schema; - private static final Class SRC_CLASS = YangSchemaSourceRepresentation.class; - private static final Class DST_CLASS = YinXmlSchemaSource.class; + public static final Class SRC_CLASS = YangSchemaSourceRepresentation.class; + public static final Class DST_CLASS = YinXmlSchemaSource.class; @Mock - private SchemaRepository provider; + public SchemaRepository provider; @Mock - private SchemaSourceRegistry consumer; + public SchemaSourceRegistry consumer; @Mock - private AsyncFunction function; + public AsyncFunction function; + + public SchemaSourceTransformer schema; @Test public void schemaSourceTransformerTest() { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java index 3e883fd381..c51434c2b4 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/BitsTypeTest.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @RunWith(MockitoJUnitRunner.class) public class BitsTypeTest { @Mock - private BitsTypeDefinition.Bit bit; + public BitsTypeDefinition.Bit bit; @Test public void canCreateBitsType() { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java index 9086f37642..3c4fe6e1eb 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/ModuleDependencySortTest.java @@ -28,20 +28,20 @@ import org.opendaylight.yangtools.yang.model.api.Submodule; @RunWith(MockitoJUnitRunner.class) public class ModuleDependencySortTest { - private static final QNameModule FOO_MODULE = QNameModule.create(URI.create("foo")); - private static final QNameModule BAR_MODULE = QNameModule.create(URI.create("bar")); + public static final QNameModule FOO_MODULE = QNameModule.create(URI.create("foo")); + public static final QNameModule BAR_MODULE = QNameModule.create(URI.create("bar")); @Mock - private Module fooNoRev; + public Module fooNoRev; @Mock - private ModuleImport fooNoRevImport; + public ModuleImport fooNoRevImport; @Mock - private Module bar; + public Module bar; @Mock - private Submodule barSubmodule; + public Submodule barSubmodule; @Before public void before() { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java index 297462caac..f25b435982 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtilTest.java @@ -38,15 +38,15 @@ import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class SchemaContextUtilTest { - private static final Splitter SPACE_SPLITTER = Splitter.on(' '); - private static final URI NAMESPACE = URI.create("abc"); + public static final Splitter SPACE_SPLITTER = Splitter.on(' '); + public static final URI NAMESPACE = URI.create("abc"); @Mock - private SchemaContext mockSchemaContext; + public SchemaContext mockSchemaContext; @Mock - private Module mockModule; + public Module mockModule; @Mock - private SchemaNode schemaNode; + public SchemaNode schemaNode; @Before public void before() { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java index 80b0a20ef3..5f5f30de79 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaNodeUtilsTest.java @@ -46,7 +46,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class SchemaNodeUtilsTest { @Mock - private DerivableSchemaNode derivableNode; + public DerivableSchemaNode derivableNode; @Test public void testHandleNullGetOriginalIfPossible() { diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index 79178a250b..6d2c5292dc 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -77,14 +77,6 @@ - - maven-surefire-plugin - - @{argLine} - --add-opens org.opendaylight.yangtools.yang.parser.rfc7950/org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path=ALL-UNNAMED - - - org.codehaus.mojo diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java index 0dde2a406b..1bdcafff01 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/path/PathExpressionParserTest.java @@ -44,10 +44,11 @@ import org.opendaylight.yangtools.yang.xpath.api.YangXPathAxis; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class PathExpressionParserTest { @Mock - private StmtContext ctx; + public StmtContext ctx; @Mock - private StatementSourceReference ref; - private final PathExpressionParser parser = new PathExpressionParser(); + public StatementSourceReference ref; + + public final PathExpressionParser parser = new PathExpressionParser(); @Before public void before() { diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml index d4bf1619d4..2657ac1a0e 100644 --- a/yang/yang-parser-spi/pom.xml +++ b/yang/yang-parser-spi/pom.xml @@ -40,16 +40,4 @@ mockito-configuration - - - - maven-surefire-plugin - - @{argLine} - --add-opens org.opendaylight.yangtools.yang.parser.spi/org.opendaylight.yangtools.yang.parser.spi.source=ALL-UNNAMED - - - - - diff --git a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java index 54dcb914ed..63f2e95b55 100644 --- a/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java +++ b/yang/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/SourceExceptionTest.java @@ -22,7 +22,7 @@ import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class SourceExceptionTest { @Mock - private StatementSourceReference mock; + public StatementSourceReference mock; @Before public void before() { -- 2.36.6