Fix javadoc formatting issues

[yangtools.git] / yang / yang-model-util / src / test / java / org / opendaylight / yangtools / yang / model / util / SchemaContextProxyTest.java

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
index e9a34d8d8d1a474228255866ce9423279ad7a3c2..5fd9c37364de30dca7c6a58ac099644b2f817046 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-
 import com.google.common.collect.Sets;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -54,8 +53,7 @@ public class SchemaContextProxyTest {
         revision2 = SimpleDateFormatUtil.getRevisionFormat().parse("2015-01-15");
     }
 
-    private SchemaContext mockSchema(Module... module) {
-
+    private static SchemaContext mockSchema(final Module... module) {
         SchemaContext mock = mock(SchemaContext.class);
         doReturn(Sets.newHashSet(module)).when(mock).getModules();
         return mock;
@@ -66,7 +64,7 @@ public class SchemaContextProxyTest {
      * CFG(R)
      *  | \
      *  |  \
-     * M2 <- M3
+     * M2 &lt;- M3
      * </pre>
      */
     @Test
@@ -89,7 +87,7 @@ public class SchemaContextProxyTest {
      * No root or additional modules
      *  | \
      *  |  \
-     * M2 <- M3
+     * M2 &lt;- M3
      * </pre>
      */
     @Test
@@ -112,7 +110,7 @@ public class SchemaContextProxyTest {
      *  Config
      *  | \ (NR)
      *  |  \
-     * M2 <- M3
+     * M2 &lt;- M3
      * </pre>
      */
     @Test
@@ -137,7 +135,7 @@ public class SchemaContextProxyTest {
      *     CFG(R)
      *    |      \
      *   |         \
-     * M2<-(NullRev)M3
+     * M2&lt;-(NullRev)M3
      * </pre>
      */
     @Test
@@ -189,7 +187,7 @@ public class SchemaContextProxyTest {
      * CFG(R)
      *  |
      *  |
-     * M2 <- M3
+     * M2 &lt;- M3
      * </pre>
      */
     @Test
@@ -212,7 +210,7 @@ public class SchemaContextProxyTest {
      * CFG(R)
      *  |
      *  |
-     * M2 -> M3 -> M4 -> M5
+     * M2 -&gt; M3 -&gt; M4 -&gt; M5
      * </pre>
      */
     @Test
@@ -238,7 +236,7 @@ public class SchemaContextProxyTest {
      * CFG(R)
      *  |
      *  |
-     * M2 -> M3 <- M4
+     * M2 -&gt; M3 &lt;- M4
      * </pre>
      */
     @Test
@@ -289,7 +287,7 @@ public class SchemaContextProxyTest {
      * CFG(R)
      *  | \
      *  |  \
-     * M2 <- M3 M4=M3(Different revision)
+     * M2 &lt;- M3 M4=M3(Different revision)
      * </pre>
      */
     @Test
@@ -314,11 +312,11 @@ public class SchemaContextProxyTest {
      * <pre>
      * CFG(R)
      * |
-     * M2 -(no revision)-> M3(R2) ... M3(R1)
+     * M2 -(no revision)-&gt; M3(R2) ... M3(R1)
      * </pre>
      */
     @Test
-    public void testImportNoRevision() throws Exception {
+    public void testImportNoRevision() {
         Module moduleConfig = mockModule(CONFIG_NAME, revision);
         Module module2 = mockModule(MODULE2_NAME, revision);
 
@@ -339,13 +337,13 @@ public class SchemaContextProxyTest {
      * CFG(R)
      * |   \
      * |    \
-     * |    M2 -> M3
+     * |    M2 -&gt; M3
      * |
-     * M41(S) => M4
+     * M41(S) =&gt; M4
      * </pre>
      */
     @Test
-    public void testBasicSubmodule() throws Exception {
+    public void testBasicSubmodule() {
         Module moduleConfig = mockModule(CONFIG_NAME);
         Module module2 = mockModule(MODULE2_NAME);
         Module module3 = mockModule(MODULE3_NAME);
@@ -365,7 +363,7 @@ public class SchemaContextProxyTest {
     /**
      * <pre>
      *
-     * M2 -> M3 -> M4 -> M5
+     * M2 -&gt; M3 -&gt; M4 -&gt; M5
      *
      * </pre>
      */
@@ -394,7 +392,7 @@ public class SchemaContextProxyTest {
      *  |       M5
      * M2
      *
-     * M3 -> M4
+     * M3 -&gt; M4
      *
      * </pre>
      */
@@ -416,7 +414,7 @@ public class SchemaContextProxyTest {
         assertProxyContext(filteringSchemaContextProxy, moduleConfig, module2, module3, module4);
     }
 
-    private void assertProxyContext(FilteringSchemaContextProxy filteringSchemaContextProxy, Module... expected) {
+    private static void assertProxyContext(final FilteringSchemaContextProxy filteringSchemaContextProxy, final Module... expected) {
 
         Set<Module> modSet = Sets.newHashSet();
 
@@ -444,9 +442,10 @@ public class SchemaContextProxyTest {
         }
     }
 
-    private FilteringSchemaContextProxy createProxySchemaCtx(SchemaContext schemaContext, Set<Module> additionalModules, Module... modules) {
+    private static FilteringSchemaContextProxy createProxySchemaCtx(final SchemaContext schemaContext,
+            final Set<Module> additionalModules, final Module... modules) {
 
-        Set<Module> modulesSet = new HashSet();
+        Set<Module> modulesSet = new HashSet<>();
 
         if(modules!=null) {
 
@@ -457,7 +456,7 @@ public class SchemaContextProxyTest {
         return new FilteringSchemaContextProxy(schemaContext, createModuleIds(modulesSet) , createModuleIds(additionalModules));
     }
 
-    private Set<ModuleId> createModuleIds(Set<Module> modules) {
+    private static Set<ModuleId> createModuleIds(final Set<Module> modules) {
 
         Set<ModuleId> moduleIds = Sets.newHashSet();
 
@@ -472,7 +471,7 @@ public class SchemaContextProxyTest {
         return moduleIds;
     }
 
-    private void mockSubmodules(Module mainModule, Module... submodules){
+    private static void mockSubmodules(final Module mainModule, final Module... submodules) {
 
         Set<Module> submodulesSet = new HashSet<>();
         submodulesSet.addAll(Arrays.asList(submodules));
@@ -480,7 +479,7 @@ public class SchemaContextProxyTest {
         doReturn(submodulesSet).when(mainModule).getSubmodules();
     }
 
-    private void mockModuleImport(Module importer, Module... imports) {
+    private static void mockModuleImport(final Module importer, final Module... imports) {
         Set<ModuleImport> mockedImports = Sets.newHashSet();
         for (final Module module : imports) {
             mockedImports.add(new ModuleImport() {
@@ -510,7 +509,7 @@ public class SchemaContextProxyTest {
     }
 
     //mock module with revision
-    private Module mockModule(String name, final Date rev){
+    private static Module mockModule(final String name, final Date rev) {
 
         final Module mod = mockModule(name);
 
@@ -522,7 +521,7 @@ public class SchemaContextProxyTest {
     }
 
     //mock module with default revision
-    private Module mockModule(String mName) {
+    private static Module mockModule(final String mName) {
 
         Module mockedModule = mock(Module.class);
         doReturn(mName).when(mockedModule).getName();