Ranides Atterwim 10 éve
szülő
commit
52f73ea053

+ 1 - 3
assira.junit/src/main/java/net/ranides/assira/junit/TestContractRunner.java

@@ -108,7 +108,7 @@ public class TestContractRunner {
         return irun(new TGeneratorS(generator));
     }
     
-    private boolean irun(TGenerator generator) {
+    private boolean irun(TGenerator generator) { //NOPMD
         Class<?> type = generator.get().getClass();
         Counter counter = new Counter();
         List<String> failed = new ArrayList<>();
@@ -308,11 +308,9 @@ public class TestContractRunner {
     
     private static final class TesterWrapper {
         
-        private final Object object;
         private final Map<String, IParam> resources = new HashMap<>();
 
         public TesterWrapper(Object object) {
-            this.object = object;
             for(Class<?> c=object.getClass(); c!=null; c=c.getSuperclass()) {
                 for(Field f : c.getDeclaredFields()) {
                     Resource info = f.getAnnotation(Resource.class);

+ 1 - 1
assira.junit/src/main/java/org/slf4j/impl/StaticLoggerBinder.java

@@ -41,7 +41,7 @@ public final class StaticLoggerBinder implements LoggerFactoryBinder {
      * against. The value of this field is usually modified with each release.
      */
     // to avoid constant folding by the compiler, this field must *not* be final
-    public static String REQUESTED_API_VERSION = "1.6.99"; // !final
+    public static String REQUESTED_API_VERSION = "1.6.99"; // NOPMD !final
     
     /**
      * The unique instance of this class.

+ 11 - 12
assira.junit/src/test/java/net/ranides/assira/junit/TestContractRunnerTest.java

@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,8 +22,8 @@ import java.util.regex.Pattern;
 import net.ranides.assira.junit.mockup.TesterObjects;
 import net.ranides.assira.junit.mockup.TesterObjects.*;
 import net.ranides.assira.junit.mockup.Testers;
-import org.junit.Assert;
 import org.junit.Test;
+import static net.ranides.assira.junit.NewAssert.*;
 
 /**
  *
@@ -88,12 +89,12 @@ public class TestContractRunnerTest {
         suite.run(() -> new ObjectABC());
         suite.run(() -> new ObjectA());
         suite.run(() -> new AbstractAB(){});
-        Assert.assertEquals(EXPECTED, TesterObjects.OUT);
+        assertEquals(EXPECTED, TesterObjects.OUT);
     }
     
     @Test
     public void testInvalid() {
-        NewAssert.assertThrows(AssertionError.class, () ->
+        assertThrows(AssertionError.class, () ->
             new TestContractRunner(System.err).append(new Testers.Invalid())
         );
     }
@@ -105,7 +106,7 @@ public class TestContractRunnerTest {
 
         TesterObjects.OUT.clear();
         suite.run(() -> new ObjectA());
-        Assert.assertEquals(EXPECTED_A, TesterObjects.OUT);
+        assertEquals(EXPECTED_A, TesterObjects.OUT);
     }
     
     @Test
@@ -119,10 +120,8 @@ public class TestContractRunnerTest {
 
         TesterObjects.OUT.clear();
         suite.run(() -> new ObjectA());
-		System.out.println(">>>" + out.toString());
-		System.out.println(">>>" + EXPECTED_OUT);
-        Assert.assertEquals(EXPECTED_OUT, out.toString());
-        Assert.assertEquals(EXPECTED_A, TesterObjects.OUT);
+        assertEquals(EXPECTED_OUT, out.toString());
+        assertEquals(EXPECTED_A, TesterObjects.OUT);
     }
     
     @Test
@@ -132,12 +131,12 @@ public class TestContractRunnerTest {
         new TestContractRunner(System.err)
             .append(new Testers.ForMap())
             .run(() -> new TreeMap<>());
-        Assert.assertEquals(Arrays.asList("map"), TesterObjects.OUT);
+        assertEquals(Arrays.asList("map"), TesterObjects.OUT);
     }
     
     @Test
     public void testWildcardSupplier() {
-        NewAssert.assertThrows(AssertionError.class, ()->{
+        assertThrows(AssertionError.class, ()->{
             new TestContractRunner(System.err)
                 .append(new Testers.ForWildcard())
                 .run(() -> new TreeMap<>());
@@ -150,7 +149,7 @@ public class TestContractRunnerTest {
         new TestContractRunner(System.err)
             .append(new Testers.ForFunction())
             .run((int[] args) -> new ArrayList<>());
-        Assert.assertEquals(EXPECTED_FUNCTION, TesterObjects.OUT);
+        assertEquals(EXPECTED_FUNCTION, TesterObjects.OUT);
     }
     
     @Test
@@ -168,7 +167,7 @@ public class TestContractRunnerTest {
         suite
             .param("name", "ot")
             .run(() -> new Object());
-        Assert.assertEquals(EXPECTED_RES, TesterObjects.OUT);
+        assertEquals(EXPECTED_RES, TesterObjects.OUT);
     }
     
     private static class TeeStream extends FilterOutputStream {