Fixed tests after d62240fb5

This commit is contained in:
Tagir Valeev
2018-03-14 14:59:14 +07:00
parent efcdd463e1
commit 4cef8a998c
@@ -18,9 +18,9 @@ package com.intellij.java.codeInspection.dataFlow.rangeSet;
import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet;
import com.intellij.codeInspection.dataFlow.value.DfaRelationValue.RelationType;
import com.intellij.psi.PsiType;
import java.util.HashMap;
import org.junit.Test;
import java.util.HashMap;
import java.util.Random;
import java.util.function.Function;
import java.util.function.LongBinaryOperator;
@@ -50,9 +50,9 @@ public class LongRangeSetTest {
assertEquals("{-128..127}", fromType(PsiType.BYTE).toString());
assertEquals("{0..65535}", fromType(PsiType.CHAR).toString());
assertEquals("{-32768..32767}", fromType(PsiType.SHORT).toString());
assertEquals("{-2147483648..2147483647}", fromType(PsiType.INT).toString());
assertEquals("{0..2147483647}", indexRange().toString());
assertEquals("{-9223372036854775808..9223372036854775807}", fromType(PsiType.LONG).toString());
assertEquals("{Integer.MIN_VALUE..Integer.MAX_VALUE}", fromType(PsiType.INT).toString());
assertEquals("{0..Integer.MAX_VALUE}", indexRange().toString());
assertEquals("{Long.MIN_VALUE..Long.MAX_VALUE}", fromType(PsiType.LONG).toString());
}
@Test
@@ -84,8 +84,8 @@ public class LongRangeSetTest {
assertEquals("{0}", range(0, 20).subtract(range(1, Long.MAX_VALUE)).toString());
assertTrue(range(0, 20).subtract(range(0, Long.MAX_VALUE)).isEmpty());
assertEquals("{-9223372036854775808}", all().subtract(range(Long.MIN_VALUE + 1, Long.MAX_VALUE)).toString());
assertEquals("{9223372036854775807}", all().subtract(range(Long.MIN_VALUE, Long.MAX_VALUE - 1)).toString());
assertEquals("{Long.MIN_VALUE}", all().subtract(range(Long.MIN_VALUE + 1, Long.MAX_VALUE)).toString());
assertEquals("{Long.MAX_VALUE}", all().subtract(range(Long.MIN_VALUE, Long.MAX_VALUE - 1)).toString());
assertTrue(all().subtract(range(Long.MIN_VALUE, Long.MAX_VALUE)).isEmpty());
assertEquals(indexRange(), fromType(PsiType.INT).subtract(range(Long.MIN_VALUE, (long)-1)));
assertTrue(all().subtract(all()).isEmpty());
@@ -252,7 +252,7 @@ public class LongRangeSetTest {
assertEquals(range(100, 200), range(100, 200).fromRelation(RelationType.EQ));
assertNull(range(100, 200).fromRelation(RelationType.IS));
assertEquals(fromType(PsiType.LONG), range(100, 200).fromRelation(RelationType.NE));
assertEquals("{-9223372036854775808..99, 101..9223372036854775807}", point(100).fromRelation(RelationType.NE).toString());
assertEquals("{Long.MIN_VALUE..99, 101..Long.MAX_VALUE}", point(100).fromRelation(RelationType.NE).toString());
}
@Test
@@ -338,7 +338,7 @@ public class LongRangeSetTest {
checkMod(point(10), point(0), "{}");
checkMod(range(0, 10), point(0), "{}");
checkMod(range(Long.MIN_VALUE, Long.MIN_VALUE + 3), point(Long.MIN_VALUE), "{-9223372036854775807..-9223372036854775805, 0}");
checkMod(range(Long.MAX_VALUE - 3, Long.MAX_VALUE), point(Long.MAX_VALUE), "{0..9223372036854775806}");
checkMod(range(Long.MAX_VALUE - 3, Long.MAX_VALUE), point(Long.MAX_VALUE), "{0..Long.MAX_VALUE-1}");
}
@Test
@@ -363,13 +363,13 @@ public class LongRangeSetTest {
checkAdd(point(Integer.MAX_VALUE), point(Integer.MAX_VALUE), true, "{" + 0xFFFF_FFFEL + "}");
checkAdd(range(0, 10), point(10), false, "{10..20}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(1), true, "{2147483638..2147483648}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(1), false, "{-2147483648, 2147483638..2147483647}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(10), false, "{-2147483648..-2147483639, 2147483647}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(11), false, "{-2147483648..-2147483638}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(1), false, "{Integer.MIN_VALUE, 2147483638..Integer.MAX_VALUE}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(10), false, "{Integer.MIN_VALUE..-2147483639, Integer.MAX_VALUE}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), point(11), false, "{Integer.MIN_VALUE..-2147483638}");
checkAdd(range(0, 10), range(20, 30), true, "{20..40}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), range(0, 10), true, "{2147483637..2147483657}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), range(0, 10), false, "{-2147483648..-2147483639, 2147483637..2147483647}");
checkAdd(range(Integer.MAX_VALUE - 10, Integer.MAX_VALUE), range(0, 10), false, "{Integer.MIN_VALUE..-2147483639, 2147483637..Integer.MAX_VALUE}");
checkAdd(range(10, 20).union(range(40, 50)), range(0, 3).union(range(5, 7)), true, "{10..27, 40..57}");