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 <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index 352cf65aaa438b35cab7fffdf3e546d72e9ad257..56337c1a1075d4751bcca71c23238b8b31324496 100644 (file)
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -39,24 +39,4 @@
             <artifactId>guava</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>@{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
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

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 8dea691e90c0761721d4f17837eccad98267f4b9..747cc1a4d49b4922f6222f182df1266ca40a5691 100644 (file)
--- 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 dbcf36fb0f937b3f368cacdf604e6320787d9f96..054da31a302eff927112c2463caf1d44b8d4d9fe 100644 (file)
--- 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 5d9bf85129841657137d9638cc7e3f1889449d9b..b9a4ee7df3cef1e8ff8188bd236a0e9d2a36a216 100644 (file)
--- 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 ed4e25075e5dcd53679a30e03ab5f02f624444d7..26236f26e0f832e5e483350b0c050ac10b8250cf 100644 (file)
--- 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<TestSchemaSourceRepresentation> source;
-    private PotentialSchemaSource<TestSchemaSourceRepresentation> same;
+    public SourceIdentifier sourceIdentifier;
+    public PotentialSchemaSource<TestSchemaSourceRepresentation> source;
+    public PotentialSchemaSource<TestSchemaSourceRepresentation> same;
 
     @Before
     public void before() {

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index c229dd42974ea44a2a6b591d5053a41eaaa18d28..a6fee63db15d42971913c61373c244ad61c4bb93 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -42,20 +42,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>@{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
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

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 99478171b38049681e5ee295a111e4c8fb5bcf7b..538b80944485518acaef096fc01d0f35d03bc9b9 100644 (file)
--- 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 40129a7f6c12d085e899f9eadb337d3fc4ff64af..0e59fb072345aef63d5c15101ba6a83402cee637 100644 (file)
--- 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<YangSchemaSourceRepresentation> REPRESENTATION = YangSchemaSourceRepresentation.class;
-    private static final long LIFETIME = 1000L;
-    private static final TimeUnit UNITS = TimeUnit.MILLISECONDS;
+    public static final Class<YangSchemaSourceRepresentation> 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 df0de0ca49b9420714bdb1911b6e1819c0202661..77627975286815ae0f203873cc493d78b28f6578 100644 (file)
--- 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 1abd85be33e80b0512d44385523a7f8c427b3ad0..6fa740ee191fa820e0bff8339c403797a6d5601a 100644 (file)
--- 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<YangSchemaSourceRepresentation, YinXmlSchemaSource> schema;
-    private static final Class<YangSchemaSourceRepresentation> SRC_CLASS = YangSchemaSourceRepresentation.class;
-    private static final Class<YinXmlSchemaSource> DST_CLASS = YinXmlSchemaSource.class;
+    public static final Class<YangSchemaSourceRepresentation> SRC_CLASS = YangSchemaSourceRepresentation.class;
+    public static final Class<YinXmlSchemaSource> DST_CLASS = YinXmlSchemaSource.class;
 
     @Mock
-    private SchemaRepository provider;
+    public SchemaRepository provider;
 
     @Mock
-    private SchemaSourceRegistry consumer;
+    public SchemaSourceRegistry consumer;
 
     @Mock
-    private AsyncFunction<YangSchemaSourceRepresentation, YinXmlSchemaSource> function;
+    public AsyncFunction<YangSchemaSourceRepresentation, YinXmlSchemaSource> function;
+
+    public SchemaSourceTransformer<YangSchemaSourceRepresentation, YinXmlSchemaSource> 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 3e883fd3812dfeb5cbbd3dcdd2c6c8ad61acd6bd..c51434c2b4ddc5bb98d373b067f9245036935fbd 100644 (file)
--- 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 9086f37642f8aea8d987e6095ec46f7e42e0247e..3c4fe6e1ebb51ee1a9b3146353543cf841eb1763 100644 (file)
--- 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 297462caacd145f2ddd5c95ce4a131767a71fd48..f25b435982aa9cbe506764551456df079031fe56 100644 (file)
--- 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 80b0a20ef36ef146450151115d7496318314f29f..5f5f30de7906b9bdd5d27dfc3ea58d8c049faca1 100644 (file)
--- 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 79178a250bf8a73d7a6d08d890af88728d142038..6d2c5292dc4b3771206cb468145116e652523002 100644 (file)
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -77,14 +77,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>@{argLine}
-                        --add-opens org.opendaylight.yangtools.yang.parser.rfc7950/org.opendaylight.yangtools.yang.parser.rfc7950.stmt.path=ALL-UNNAMED
-                    </argLine>
-                </configuration>
-            </plugin>
             <plugin>
                 <!-- FIXME: why is this needed? -->
                 <groupId>org.codehaus.mojo</groupId>

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 0dde2a406b36afbafea1cd24874e6129c0255db6..1bdcafff014fc5f3d932dded2df47335ecfc68e5 100644 (file)
--- 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 d4bf1619d4a5fa23122cd3265057eb94a2124642..2657ac1a0ea86d8549707e9bce40e80503ffd397 100644 (file)
--- a/yang/yang-parser-spi/pom.xml
+++ b/yang/yang-parser-spi/pom.xml
@@ -40,16 +40,4 @@
             <artifactId>mockito-configuration</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>@{argLine}
-                        --add-opens org.opendaylight.yangtools.yang.parser.spi/org.opendaylight.yangtools.yang.parser.spi.source=ALL-UNNAMED
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

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 54dcb914ed8af2330a490992bc2cb1cda0e87f0a..63f2e95b55e371934fb93d7511c79a1d2063cacc 100644 (file)
--- 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() {