Checkstyle clean-up src/test/java

Required to be able to run (enforce) CS on src/test as well.

Change-Id: Ifa974a62fc5d912fc6e8a710851da7618254e256
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml
index 53467208a97efdac0ceb6fb361499cf43d3a3371..7b17db1bc7cd7342ae4079af909f72a0f4ba458e 100644 (file)
--- a/common/checkstyle-logging/pom.xml
+++ b/common/checkstyle-logging/pom.xml
@@ -48,6 +48,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
+          <includeTestSourceDirectory>false</includeTestSourceDirectory>
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>

diff --git a/websocket/websocket-client/pom.xml b/websocket/websocket-client/pom.xml
index 8d4dcbff5cb3839d2f45bd77447c98b5c4d9557d..235005842d5dc8f6bdc92c0c5f803fe81afdc270 100644 (file)
--- a/websocket/websocket-client/pom.xml
+++ b/websocket/websocket-client/pom.xml
@@ -41,4 +41,15 @@
             <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <includeTestSourceDirectory>false</includeTestSourceDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerInitializer.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerInitializer.java
index 350eb8fcefc0c6188d8df74bbd6a3071cd1e3a0d..4c7f0ce92f07a190a8ba7206b29f108e4f12f4e9 100644 (file)
--- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerInitializer.java
+++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerInitializer.java
@@ -22,8 +22,6 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 import org.opendaylight.yangtools.websocket.server.WebSocketServerHandler;
 
-/**
- */
 public class WebSocketServerInitializer extends ChannelInitializer<SocketChannel> {
     @Override
     public void initChannel(SocketChannel ch) throws Exception {

diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/OperationFailedExceptionTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/OperationFailedExceptionTest.java
index 70b876eacd85729f92c331fff3dea1d1dc7e561b..def8552e251c66bccc9cdc18b4018d085ebb6b69 100644 (file)
--- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/OperationFailedExceptionTest.java
+++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/OperationFailedExceptionTest.java
@@ -4,9 +4,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
-
 package org.opendaylight.yangtools.yang.common;
 
 import static org.junit.Assert.assertEquals;
@@ -26,4 +24,4 @@ public class OperationFailedExceptionTest {
         assertEquals(operationFailedException1.getErrorList(), operationFailedException2.getErrorList());
         assertTrue(operationFailedException1.toString().contains("error msg"));
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/YangConstantsTest.java b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/YangConstantsTest.java
index 7216db7a1a2fd1db17b00f484f5cee5eac685a7e..7f161512016cda132351245f13bc8b2b851d6257 100644 (file)
--- a/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/YangConstantsTest.java
+++ b/yang/yang-common/src/test/java/org/opendaylight/yangtools/yang/common/YangConstantsTest.java
@@ -4,9 +4,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
-
 package org.opendaylight.yangtools.yang.common;
 
 import static org.junit.Assert.assertEquals;
@@ -25,4 +23,4 @@ public class YangConstantsTest {
         assertEquals(QNameModule.create(uriYang, null).intern(), YangConstants.RFC6020_YANG_MODULE);
         assertEquals(QNameModule.create(uriYin, null).intern(), YangConstants.RFC6020_YIN_MODULE);
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/ModifyActionTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/ModifyActionTest.java
index 2218ee1884f29e8479eee9d6d101f5c59ce09bf1..a0877f7c4e9f1935c013fb88fe69a6af9c30f4bd 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/ModifyActionTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/ModifyActionTest.java
@@ -4,9 +4,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
-
 package org.opendaylight.yangtools.yang.data.api;
 
 import static org.junit.Assert.assertEquals;

diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
index 19377b1b0c0129801712c643844093402ede716b..127dcf713c39086cd146a1fe1dbea4188572b460 100644 (file)
--- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
+++ b/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java
@@ -4,9 +4,7 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
-
 package org.opendaylight.yangtools.yang.data.api.schema.tree.spi;
 
 import static org.junit.Assert.assertEquals;
@@ -33,4 +31,4 @@ public class DuplicityTest {
         assertEquals(0, normalizedNodeDuplicateEntryMapNode.size());
         assertEquals(0, normalizedNodeDuplicateEntryMapContainer.size());
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNodeTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNodeTest.java
index 2353d3771ed8a6708ed5c252a54a06ccba19d5e1..934fe0345f49e40dd92f3f4af643e4b74e7997b4 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNodeTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueAttrNodeTest.java
@@ -1,5 +1,9 @@
-/**
+/*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.yangtools.yang.data.impl.schema.nodes;
 

diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java
index cd55369d127ecac6b5d9ec9b75195abc0e4626bd..d1f4200239db915aba16e0f895a6df1bd0536a7b 100644 (file)
--- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java
+++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/test/SimpleModuleTest.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.yangtools.yang.model.export.test;
 
 import java.io.File;

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 59bbfd93c63fe66634bae9b0241fac6f5659478e..be3ce52eac18b9b8c8a9b905bd2ec556456f3c99 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
@@ -3,9 +3,8 @@
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html.html
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.model.util;
 
 import static org.junit.Assert.assertEquals;

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java
index d4fdc97fd31d8cd63edc7c24d9a21951292aa21e..0038007cc691c190104d917660b599dd713436e0 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.yangtools.yang.parser.repo;
 
 import static org.junit.Assert.assertNotNull;