Nantes Université

Skip to content
Extraits de code Groupes Projets
Valider b59764f6 rédigé par Gerson Sunyé's avatar Gerson Sunyé
Parcourir les fichiers

Correct static method import in tests

parent c886f596
Branches
Étiquettes
Aucune requête de fusion associée trouvée
Pipeline #73422 réussi
Étape : .pre
Étape : build
Masquer les modifications d'espaces
En ligne Côte à côte
commons-assertions/src/main/java/org/atlanmod/commons/assertions/AbstractAssertion.java
+ 1
− 1
Voir le fichier @ b59764f6
...@@ -43,7 +43,7 @@ public abstract class AbstractAssertion implements Assertion { ...@@ -43,7 +43,7 @@ public abstract class AbstractAssertion implements Assertion {
/** /**
* The pattern used to format assertion messages when the assertion fails. * The pattern used to format assertion messages when the assertion fails.
*/ */
static final String PATTERNFALSE = "\nExpecting value (%s) not to be %s (%s)"; static final String PATTERN_FALSE = "\nExpecting value (%s) not to be %s (%s)";
......
commons-assertions/src/main/java/org/atlanmod/commons/assertions/DoubleAssertion.java
+ 1
− 1
Voir le fichier @ b59764f6
...@@ -78,7 +78,7 @@ public class DoubleAssertion extends AbstractAssertion implements DoubleAssertio ...@@ -78,7 +78,7 @@ public class DoubleAssertion extends AbstractAssertion implements DoubleAssertio
public DoubleAssertionInterface isNotEqualTo(double expected) { public DoubleAssertionInterface isNotEqualTo(double expected) {
if (thresholdCompare(value, expected)) { if (thresholdCompare(value, expected)) {
check = false; check = false;
message += String.format(PATTERNFALSE, value, expected, ("within tolerance : " + tolerance)); message += String.format(PATTERN_FALSE, value, expected, ("within tolerance : " + tolerance));
} }
return this; return this;
} }
......
commons-assertions/src/main/java/org/atlanmod/commons/assertions/FloatAssertion.java
+ 1
− 1
Voir le fichier @ b59764f6
...@@ -76,7 +76,7 @@ public class FloatAssertion extends AbstractAssertion implements FloatAssertionI ...@@ -76,7 +76,7 @@ public class FloatAssertion extends AbstractAssertion implements FloatAssertionI
public FloatAssertionInterface isNotEqualTo(float expected) { public FloatAssertionInterface isNotEqualTo(float expected) {
if (thresholdCompare(value, expected)) { if (thresholdCompare(value, expected)) {
check = false; check = false;
message += String.format(PATTERNFALSE, value, expected, ("within tolerance : " + tolerance)); message += String.format(PATTERN_FALSE, value, expected, ("within tolerance : " + tolerance));
} }
......
commons-assertions/src/test/java/org/atlanmod/commons/assertions/AssertTest.java
+ 85
− 92
Voir le fichier @ b59764f6
...@@ -15,9 +15,8 @@ import java.util.HashMap; ...@@ -15,9 +15,8 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static org.atlanmod.commons.Preconditions.requireThat; import static org.atlanmod.commons.assertions.AbstractAssertion.assertion;
import static org.atlanmod.commons.assertions.Assertions.assertThat;
import static org.atlanmod.commons.assertions.AbstractAssertion.*;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
/** /**
...@@ -39,7 +38,8 @@ class AssertTest { ...@@ -39,7 +38,8 @@ class AssertTest {
@Test @Test
public void AssertionTest() { public void AssertionTest() {
AbstractAssertion assertion = new AbstractAssertion(1) {}; AbstractAssertion assertion = new AbstractAssertion(1) {
};
assertTrue(assertion.check()); assertTrue(assertion.check());
assertTrue(assertion().message().equals(String.format("AbstractAssertion failures in thread %s : \n", Thread.currentThread().getName()))); assertTrue(assertion().message().equals(String.format("AbstractAssertion failures in thread %s : \n", Thread.currentThread().getName())));
} }
...@@ -52,8 +52,8 @@ class AssertTest { ...@@ -52,8 +52,8 @@ class AssertTest {
*/ */
@Test @Test
public void BooleanAssertionTest() { public void BooleanAssertionTest() {
assertTrue(Assertions.assertThat(true).isTrue().check()); assertTrue(assertThat(true).isTrue().check());
assertTrue(Assertions.assertThat(false).isFalse().check()); assertTrue(assertThat(false).isFalse().check());
} }
...@@ -82,12 +82,12 @@ class AssertTest { ...@@ -82,12 +82,12 @@ class AssertTest {
set2.add(1); set2.add(1);
set2.add(2); set2.add(2);
assertTrue(Assertions.assertThat(set).contains(1).check()); assertTrue(assertThat(set).contains(1).check());
assertTrue(Assertions.assertThat(set).doesNotContain(10).check()); assertTrue(assertThat(set).doesNotContain(10).check());
assertTrue(Assertions.assertThat(set).isNotEmpty().check()); assertTrue(assertThat(set).isNotEmpty().check());
assertTrue(Assertions.assertThat(set).contains(set2).check()); assertTrue(assertThat(set).contains(set2).check());
assertTrue(Assertions.assertThat(set2).doesNotContain(set).check()); assertTrue(assertThat(set2).doesNotContain(set).check());
assertFalse(Assertions.assertThat(set).isEmpty().check()); assertFalse(assertThat(set).isEmpty().check());
} }
...@@ -106,14 +106,14 @@ class AssertTest { ...@@ -106,14 +106,14 @@ class AssertTest {
Integer j = 1; Integer j = 1;
Integer k = 2; Integer k = 2;
assertTrue(Assertions.assertThat(i).isEqualTo(j).check()); assertTrue(assertThat(i).isEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isNotEqualTo(k).check()); assertTrue(assertThat(i).isNotEqualTo(k).check());
assertTrue(Assertions.assertThat(i).isGreaterThan(-1).check()); assertTrue(assertThat(i).isGreaterThan(-1).check());
assertTrue(Assertions.assertThat(i).isGreaterOrEqualTo(j).check()); assertTrue(assertThat(i).isGreaterOrEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isLessThan(k).check()); assertTrue(assertThat(i).isLessThan(k).check());
assertTrue(Assertions.assertThat(i).isLessOrEqualTo(i).check()); assertTrue(assertThat(i).isLessOrEqualTo(i).check());
assertTrue(Assertions.assertThat(i).isIn(-10, 10).check()); assertTrue(assertThat(i).isIn(-10, 10).check());
assertTrue(Assertions.assertThat(i).isNotIn(-10, -5).check()); assertTrue(assertThat(i).isNotIn(-10, -5).check());
} }
...@@ -136,17 +136,17 @@ class AssertTest { ...@@ -136,17 +136,17 @@ class AssertTest {
double j = 1.0; double j = 1.0;
double k = 2.0; double k = 2.0;
assertTrue(Assertions.assertThat(i).isEqualTo(j).check()); assertTrue(assertThat(i).isEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isNotEqualTo(k).check()); assertTrue(assertThat(i).isNotEqualTo(k).check());
assertTrue(Assertions.assertThat(i).isGreaterThan(-1).check()); assertTrue(assertThat(i).isGreaterThan(-1).check());
assertTrue(Assertions.assertThat(i).isGreaterOrEqualTo(j).check()); assertTrue(assertThat(i).isGreaterOrEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isLessThan(k).check()); assertTrue(assertThat(i).isLessThan(k).check());
assertTrue(Assertions.assertThat(i).isLessOrEqualTo(i).check()); assertTrue(assertThat(i).isLessOrEqualTo(i).check());
assertTrue(Assertions.assertThat(i).isIn(-10, 10).check()); assertTrue(assertThat(i).isIn(-10, 10).check());
assertTrue(Assertions.assertThat(i).isNotIn(-10, -5).check()); assertTrue(assertThat(i).isNotIn(-10, -5).check());
assertTrue(Assertions.assertThat(i).usingToleranceOf(10.0).isEqualTo(2.0).check()); assertTrue(assertThat(i).usingToleranceOf(10.0).isEqualTo(2.0).check());
} }
...@@ -168,17 +168,17 @@ class AssertTest { ...@@ -168,17 +168,17 @@ class AssertTest {
float j = 1.0f; float j = 1.0f;
float k = 2.0f; float k = 2.0f;
assertTrue(Assertions.assertThat(i).isEqualTo(j).check()); assertTrue(assertThat(i).isEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isNotEqualTo(k).check()); assertTrue(assertThat(i).isNotEqualTo(k).check());
assertTrue(Assertions.assertThat(i).isGreaterThan(-1).check()); assertTrue(assertThat(i).isGreaterThan(-1).check());
assertTrue(Assertions.assertThat(i).isGreaterOrEqualTo(j).check()); assertTrue(assertThat(i).isGreaterOrEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isLessThan(k).check()); assertTrue(assertThat(i).isLessThan(k).check());
assertTrue(Assertions.assertThat(i).isLessOrEqualTo(i).check()); assertTrue(assertThat(i).isLessOrEqualTo(i).check());
assertTrue(Assertions.assertThat(i).isIn(-10, 10).check()); assertTrue(assertThat(i).isIn(-10, 10).check());
assertTrue(Assertions.assertThat(i).isNotIn(-10, -5).check()); assertTrue(assertThat(i).isNotIn(-10, -5).check());
assertTrue(Assertions.assertThat(i).usingToleranceOf(10.0f).isEqualTo(2.0f).check()); assertTrue(assertThat(i).usingToleranceOf(10.0f).isEqualTo(2.0f).check());
} }
...@@ -198,14 +198,14 @@ class AssertTest { ...@@ -198,14 +198,14 @@ class AssertTest {
int j = 1; int j = 1;
int k = 2; int k = 2;
assertTrue(Assertions.assertThat(i).isEqualTo(j).check()); assertTrue(assertThat(i).isEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isNotEqualTo(k).check()); assertTrue(assertThat(i).isNotEqualTo(k).check());
assertTrue(Assertions.assertThat(i).isGreaterThan(-1).check()); assertTrue(assertThat(i).isGreaterThan(-1).check());
assertTrue(Assertions.assertThat(i).isGreaterOrEqualTo(j).check()); assertTrue(assertThat(i).isGreaterOrEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isLessThan(k).check()); assertTrue(assertThat(i).isLessThan(k).check());
assertTrue(Assertions.assertThat(i).isLessOrEqualTo(i).check()); assertTrue(assertThat(i).isLessOrEqualTo(i).check());
assertTrue(Assertions.assertThat(i).isIn(-10, 10).check()); assertTrue(assertThat(i).isIn(-10, 10).check());
assertTrue(Assertions.assertThat(i).isNotIn(-10, -5).check()); assertTrue(assertThat(i).isNotIn(-10, -5).check());
} }
/** /**
...@@ -224,14 +224,14 @@ class AssertTest { ...@@ -224,14 +224,14 @@ class AssertTest {
long j = 1; long j = 1;
long k = 2; long k = 2;
assertTrue(Assertions.assertThat(i).isEqualTo(j).check()); assertTrue(assertThat(i).isEqualTo(j).check());
assertTrue(Assertions.assertThat(i).isNotEqualTo(k).check()); assertTrue(assertThat(i).isNotEqualTo(k).check());
assertTrue(Assertions.assertThat(i).isGreaterThan(-1).check()); assertTrue(assertThat(i).isGreaterThan(-1).check());
assertTrue(Assertions.assertThat(i).isGreaterOrEqualThan(j).check()); assertTrue(assertThat(i).isGreaterOrEqualThan(j).check());
assertTrue(Assertions.assertThat(i).isLessThan(k).check()); assertTrue(assertThat(i).isLessThan(k).check());
assertTrue(Assertions.assertThat(i).isLessOrEqualThan(i).check()); assertTrue(assertThat(i).isLessOrEqualThan(i).check());
assertTrue(Assertions.assertThat(i).isIn(-10, 10).check()); assertTrue(assertThat(i).isIn(-10, 10).check());
assertTrue(Assertions.assertThat(i).isNotIn(-10, -5).check()); assertTrue(assertThat(i).isNotIn(-10, -5).check());
} }
/** /**
...@@ -250,12 +250,12 @@ class AssertTest { ...@@ -250,12 +250,12 @@ class AssertTest {
Color obj4 = null; Color obj4 = null;
Color obj5 = obj1; Color obj5 = obj1;
assertTrue(Assertions.assertThat(obj1).isEqualTo(obj2).check()); assertTrue(assertThat(obj1).isEqualTo(obj2).check());
assertTrue(Assertions.assertThat(obj1).isInstanceOf(Color.class).check()); assertTrue(assertThat(obj1).isInstanceOf(Color.class).check());
assertTrue(Assertions.assertThat(obj1).isNotEqualTo(obj3).check()); assertTrue(assertThat(obj1).isNotEqualTo(obj3).check());
assertTrue(Assertions.assertThat(obj1).isNotNull().check()); assertTrue(assertThat(obj1).isNotNull().check());
assertTrue(Assertions.assertThat(obj4).isNull().check()); assertTrue(assertThat(obj4).isNull().check());
assertTrue(Assertions.assertThat(obj1).isSameInstanceAs(obj5).check()); assertTrue(assertThat(obj1).isSameInstanceAs(obj5).check());
} }
...@@ -268,28 +268,28 @@ class AssertTest { ...@@ -268,28 +268,28 @@ class AssertTest {
String str4 = "ab"; String str4 = "ab";
String str5 = "john-abe-the-third"; String str5 = "john-abe-the-third";
assertTrue(Assertions.assertThat(str5).contains(str4).check()); assertTrue(assertThat(str5).contains(str4).check());
assertTrue(Assertions.assertThat(str1).doesNotcontain(str5).check()); assertTrue(assertThat(str1).doesNotcontain(str5).check());
assertTrue(Assertions.assertThat(str5).startsWith("john").check()); assertTrue(assertThat(str5).startsWith("john").check());
assertTrue(Assertions.assertThat(str5).endsWith("third").check()); assertTrue(assertThat(str5).endsWith("third").check());
assertTrue(Assertions.assertThat(str2).doesNotEndWith(str3).check()); assertTrue(assertThat(str2).doesNotEndWith(str3).check());
assertTrue(Assertions.assertThat(str2).doesNotStartWith(str3).check()); assertTrue(assertThat(str2).doesNotStartWith(str3).check());
assertTrue(Assertions.assertThat(str1).matches("a*").check()); assertTrue(assertThat(str1).matches("a*").check());
assertTrue(Assertions.assertThat(str1).doesNotMatch("b*").check()); assertTrue(assertThat(str1).doesNotMatch("b*").check());
assertTrue(Assertions.assertThat(str1).isNotEmpty().check()); assertTrue(assertThat(str1).isNotEmpty().check());
assertFalse(Assertions.assertThat(str1).isEmpty().check()); assertFalse(assertThat(str1).isEmpty().check());
assertTrue(Assertions.assertThat(str1).hasLength(2).check()); assertTrue(assertThat(str1).hasLength(2).check());
assertTrue(Assertions.assertThat(str1).hasLength(Long.valueOf(2)).check()); assertTrue(assertThat(str1).hasLength(Long.valueOf(2)).check());
assertTrue(Assertions.assertThat(str1).doesNotHaveLength(10).check()); assertTrue(assertThat(str1).doesNotHaveLength(10).check());
assertTrue(Assertions.assertThat(str1).doesNotHaveLength(Long.valueOf(20)).check()); assertTrue(assertThat(str1).doesNotHaveLength(Long.valueOf(20)).check());
assertTrue(Assertions.assertThat(str1).ignoringCase().contains(str3).check()); assertTrue(assertThat(str1).ignoringCase().contains(str3).check());
assertTrue(Assertions.assertThat(str1).ignoringCase().startsWith("a").check()); assertTrue(assertThat(str1).ignoringCase().startsWith("a").check());
assertTrue(Assertions.assertThat(str1).ignoringCase().endsWith("A").check()); assertTrue(assertThat(str1).ignoringCase().endsWith("A").check());
assertTrue(Assertions.assertThat(str1).ignoringCase().doesNotcontain(str5).check()); assertTrue(assertThat(str1).ignoringCase().doesNotcontain(str5).check());
assertTrue(Assertions.assertThat(str2).ignoringCase().doesNotEndWith(str5).check()); assertTrue(assertThat(str2).ignoringCase().doesNotEndWith(str5).check());
assertTrue(Assertions.assertThat(str2).ignoringCase().doesNotStartWith(str5).check()); assertTrue(assertThat(str2).ignoringCase().doesNotStartWith(str5).check());
} }
...@@ -306,14 +306,14 @@ class AssertTest { ...@@ -306,14 +306,14 @@ class AssertTest {
Thread thread1 = new Thread(() -> { Thread thread1 = new Thread(() -> {
Integer a = 7; Integer a = 7;
Integer b = 10; Integer b = 10;
assert Assertions.assertThat(a).isNull().isEqualTo(b).check() : assertion().message(); assert assertThat(a).isNull().isEqualTo(b).check() : assertion().message();
}); });
Thread thread2 = new Thread(() -> { Thread thread2 = new Thread(() -> {
Integer a = 7; Integer a = 7;
Integer b = 10; Integer b = 10;
assert Assertions.assertThat(a).isInstanceOf(Long.TYPE).isNull().isEqualTo(b).check() : assertion().message(); assert assertThat(a).isInstanceOf(Long.TYPE).isNull().isEqualTo(b).check() : assertion().message();
System.out.println("thread2"); System.out.println("thread2");
}); });
...@@ -356,14 +356,7 @@ class AssertTest { ...@@ -356,14 +356,7 @@ class AssertTest {
String msg = exceptions.get(thread1).getMessage(); String msg = exceptions.get(thread1).getMessage();
msg += exceptions.get(thread2).getMessage(); msg += exceptions.get(thread2).getMessage();
assertEquals("AbstractAssertion failures in thread " + thread1.getName() + " : \n" + assertEquals("AbstractAssertion failures in thread " + thread1.getName() + " : \n" + "\n" + "Expecting value (7) to be null ()\n" + "Expecting value (7) to be 10 ()AbstractAssertion failures in thread " + thread2.getName() + " : \n" + "\n" + "Expecting 7 to an instance of java.lang.Class , but it is an instance of (java.lang.Integer)\n" + "Expecting value (7) to be null ()\n" + "Expecting value (7) to be 10 ()", msg);
"\n" +
"Expecting value (7) to be null ()\n" +
"Expecting value (7) to be 10 ()AbstractAssertion failures in thread " + thread2.getName() + " : \n" +
"\n" +
"Expecting 7 to an instance of java.lang.Class , but it is an instance of (java.lang.Integer)\n" +
"Expecting value (7) to be null ()\n" +
"Expecting value (7) to be 10 ()", msg);
} }
} }
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter