Skip to content

Commit 31a5a1b

Browse files
committed
fix tests errors
1 parent 4a42173 commit 31a5a1b

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

key.core/src/main/java/de/uka/ilkd/key/java/ast/expression/operator/UnaryOperator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public int getPrecedence() {
7878

7979
@Override
8080
public int getNotation() {
81-
return PREFIX;
81+
return kind.notation;
8282
}
8383

8484
@Override

key.core/src/main/java/de/uka/ilkd/key/speclang/ClassInvariantImpl.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.util.LinkedHashMap;
77
import java.util.Map;
8+
import java.util.Objects;
89
import java.util.function.UnaryOperator;
910

1011
import de.uka.ilkd.key.java.Services;
@@ -88,22 +89,28 @@ public ClassInvariantImpl(String name, String displayName, KeYJavaType kjt,
8889
* @param displayName the displayed name of the invariant
8990
* @param kjt the KeYJavaType to which the invariant belongs
9091
* @param visibility the visibility of the invariant (null for default visibility)
92+
* TODO weigl: what is the "default visibility"?
9193
* @param inv the invariant formula itself
9294
* @param selfVar the variable used for the receiver object
9395
* @param free whether this contract is free.
9496
*/
9597
public ClassInvariantImpl(String name, String displayName, KeYJavaType kjt,
9698
ModifierKind visibility, JTerm inv, LocationVariable selfVar,
9799
boolean free) {
98-
assert name != null && !name.isEmpty();
99-
assert displayName != null && !displayName.isEmpty();
100-
assert kjt != null;
101-
assert inv != null;
102-
this.name = name;
103-
this.displayName = displayName;
104-
this.kjt = kjt;
105-
this.visibility = visibility;
106-
this.originalInv = inv;
100+
101+
this.name = Objects.requireNonNull(name);
102+
if (name.isBlank()) {
103+
throw new IllegalArgumentException("name must not be blank");
104+
}
105+
106+
this.displayName = Objects.requireNonNull(displayName);
107+
if (displayName.isEmpty()) {
108+
throw new IllegalArgumentException("displayName must not be empty");
109+
}
110+
111+
this.kjt = Objects.requireNonNull(kjt);
112+
this.visibility = Objects.requireNonNullElse(visibility, ModifierKind.PUBLIC);
113+
this.originalInv = Objects.requireNonNull(inv);
107114
this.originalSelfVar = selfVar;
108115
final OpCollector oc = new OpCollector();
109116
originalInv.execPostOrder(oc);

0 commit comments

Comments
 (0)