Add unit test for the superav

javadev · May 28, 2014 · 03bf4f8 · 03bf4f8
1 parent 6e75aa1
commit 03bf4f8
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: java
+
+jdk:
+  - openjdk6
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8
+
+script: mvn clean test cobertura:cobertura coveralls:cobertura
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@
                    Июнь 2012 года. Valentin Kolesnikov
 *************************************************************************
 
+[![Build Status](https://secure.travis-ci.org/javadev/superav.png)](https://travis-ci.org/javadev/superav)
+[![Coverage Status](https://coveralls.io/repos/javadev/superav/badge.png?branch=master)](https://coveralls.io/r/javadev/superav)
+
 Комплект SuperAV для DOS и WIN32
 --------------------------------
 SuperAV включает в себя следующие файлы:

diff --git a/pom.xml b/pom.xml
@@ -9,6 +9,10 @@
   <name>Command line antivirus</name>
   <description>The command line antivirus program written in C program language</description>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <finalName>${project.artifactId}</finalName>
     <plugins>
@@ -21,7 +25,6 @@
           <target>1.5</target>
           <encoding>UTF-8</encoding>
           <debug>true</debug>
-          <debuglevel>none</debuglevel>
         </configuration>
       </plugin>
       <plugin>  
@@ -83,10 +86,34 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eluder.coveralls</groupId>
+        <artifactId>coveralls-maven-plugin</artifactId>
+        <version>2.2.0</version>
+        <configuration>
+          <repoToken>FUd0hCvIiZ8pA4KhlXcwBtqDUPT99bF2G</repoToken>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <format>xml</format>
+          <maxmem>256m</maxmem>
+          <aggregate>true</aggregate>
+          <instrumentation>
+            <excludes>
+              <exclude>**/Superbas*.class</exclude>
+              <exclude>**/Superlnk*.class</exclude>
+            </excludes>
+          </instrumentation>
+        </configuration>
+      </plugin>
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.0</version>
+          <version>3.3</version>
           <configuration>
             <reportPlugins>
       <plugin>
@@ -107,31 +134,34 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.8</version>
-        <configuration>
-          <configLocation>${basedir}/checkstyle.xml</configLocation>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.0.1</version>
             <configuration>
                 <targetJdk>1.5</targetJdk> 
                 <rulesets>
-                  <ruleset>rulesets/basic.xml</ruleset> 
-                  <ruleset>rulesets/design.xml</ruleset>
-                  <ruleset>rulesets/junit.xml</ruleset> 
-                  <ruleset>rulesets/finalizers.xml</ruleset>
-                  <ruleset>rulesets/clone.xml</ruleset> 
-                  <ruleset>rulesets/unusedcode.xml</ruleset>
-                  <ruleset>rulesets/imports.xml</ruleset>
-                  <ruleset>rulesets/strings.xml</ruleset>
-                  <ruleset>rulesets/braces.xml</ruleset>
-                  <ruleset>rulesets/codesize.xml</ruleset>
-                  <ruleset>rulesets/coupling.xml</ruleset>
-                  <ruleset>rulesets/strictexception.xml</ruleset>
+                  <ruleset>rulesets/java/basic.xml</ruleset>
+                  <ruleset>rulesets/java/design.xml</ruleset>
+                  <ruleset>rulesets/java/junit.xml</ruleset> 
+                  <ruleset>rulesets/java/finalizers.xml</ruleset>
+                  <ruleset>rulesets/java/clone.xml</ruleset> 
+                  <ruleset>rulesets/java/unusedcode.xml</ruleset>
+                  <ruleset>rulesets/java/imports.xml</ruleset>
+                  <ruleset>rulesets/java/strings.xml</ruleset>
+                  <ruleset>rulesets/java/braces.xml</ruleset>
+                  <ruleset>rulesets/java/codesize.xml</ruleset>
+                  <ruleset>rulesets/java/coupling.xml</ruleset>
+                  <ruleset>rulesets/java/strictexception.xml</ruleset>
                 </rulesets>
             </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>2.5.2</version>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>

diff --git a/src/main/java/com/github/superav/AbstractSuperav.java b/src/main/java/com/github/superav/AbstractSuperav.java
@@ -2,6 +2,7 @@
 
 public abstract class AbstractSuperav {
     protected boolean flagAllFiles;
+    protected boolean flagSubdir = true;
 
     public static void printf(String message) {
         Log.info(message);

diff --git a/src/main/java/com/github/superav/Findf.java b/src/main/java/com/github/superav/Findf.java
@@ -18,7 +18,7 @@ public void scanPath(File dir, Visitor visitor) {
             }
             if (!file.isDirectory()) {
                 visitor.checkFile(file);
-            } else {
+            } else if (flagSubdir) {
                 scanPath(file, visitor);
             }
         }

diff --git a/src/main/java/com/github/superav/Superav.java b/src/main/java/com/github/superav/Superav.java
@@ -2,7 +2,7 @@
 
 import java.io.File;
 
-public class Superav extends AbstractSuperav {
+public class Superav extends Findf {
     public static void main(String[] args) throws Exception {
         final Superav superav = new Superav();
         String startMes =
@@ -19,13 +19,17 @@ public static void main(String[] args) throws Exception {
                     superav.flagAllFiles = true;
                     continue;
                 }
+                if (pKey.equalsIgnoreCase("r")) {
+                    superav.flagSubdir = false;
+                    continue;
+                }
             }
         }
         if (args.length >= 1)  {
             for (String arg : args) {
                 if (!arg.startsWith("/") && !arg.startsWith("--")) {
                     printf(String.format("\nProcessing %s\n", arg));
-                    new Findf().scanPath(new File(arg), new Findf.Visitor() {
+                    superav.scanPath(new File(arg), new Visitor() {
                         public void checkFile(File file) {
                             superav.checkFile(file);
                         }

diff --git a/src/test/java/com/github/superav/SuperavTest.java b/src/test/java/com/github/superav/SuperavTest.java
@@ -0,0 +1,13 @@
+package com.github.superav;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SuperavTest {
+
+    @Test
+    public void main() throws Exception {
+        Superav.main(new String[] {});
+        Superav.main(new String[] {".", "--r"});
+    }
+}
diff --git a/superav.jar b/superav.jar