Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #54: allow a precondition in sub-contracts if no precondition i… #55

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes #54: allow a precondition in sub-contracts if no precondition i… #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions ...finedexternalclass/DefaultPreConditionShouldBeUndefinedInExternalContractsSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package de.vksi.c4j.systemtest.config.defaultpreconditionundefinedexternalclass;

import static de.vksi.c4j.Condition.preCondition;

import org.junit.Rule;
import org.junit.Test;

import de.vksi.c4j.Contract;
import de.vksi.c4j.systemtest.TransformerAwareRule;

public class DefaultPreConditionShouldBeUndefinedInExternalContractsSystemTest {
@Rule
public TransformerAwareRule transformerAwareRule = new TransformerAwareRule();

@Test(expected = AssertionError.class)
public void testPreConditionUndefinedWithExternalContract() {
new TargetClass().method(-1);
}

private static class TargetClass extends SuperClass {
}

@Contract(forTarget = TargetClass.class)
private static class ContractClass extends TargetClass {
public void method(int arg) {
if (preCondition()) {
assert arg > 0;
}
}
}

@Contract(forTarget = SuperClass.class)
private static class SuperContractClass extends SuperClass {
public void method(int arg) {
}
}

private static class SuperClass {
public void method(int arg) {
}
}
}
4 changes: 4 additions & 0 deletions c4j-systemtest/src/test/resources/c4j-local.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<root-package>de.vksi.c4j.systemtest.config.contractsdirectoryasjarfile</root-package>
<contract-scan-package>de.vksi.c4j.systemtest.config.contractsdirectoryasjarfile</contract-scan-package>
</configuration>
<configuration>
<root-package>de.vksi.c4j.systemtest.config.defaultpreconditionundefinedexternalclass</root-package>
<contract-scan-package>de.vksi.c4j.systemtest.config.defaultpreconditionundefinedexternalclass</contract-scan-package>
</configuration>
<configuration>
<root-package>singlepackage</root-package>
<pure-validate>true</pure-validate>
Expand Down
23 changes: 20 additions & 3 deletions c4j/src/main/java/de/vksi/c4j/internal/transformer/editor/ContractMethodConditionEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import static de.vksi.c4j.internal.classfile.ClassAnalyzer.getDeclaredMethod;
import static de.vksi.c4j.internal.classfile.ClassAnalyzer.getField;

import java.util.Set;

import javassist.CannotCompileException;
import javassist.CtBehavior;
import javassist.CtClass;
import javassist.CtField;
import javassist.CtMethod;
import javassist.NotFoundException;
import javassist.expr.FieldAccess;
import javassist.expr.MethodCall;
Expand All @@ -20,6 +24,7 @@
import de.vksi.c4j.internal.configuration.DefaultPreconditionType;
import de.vksi.c4j.internal.configuration.XmlConfigurationManager;
import de.vksi.c4j.internal.contracts.ContractInfo;
import de.vksi.c4j.internal.contracts.ContractMethod;
import de.vksi.c4j.internal.contracts.ContractRegistry;
import de.vksi.c4j.internal.contracts.InvolvedTypeInspector;
import de.vksi.c4j.internal.types.ListOrderedSet;
Expand Down Expand Up @@ -112,9 +117,21 @@ private void handleUndefinedDefaultPreCondition(MethodCall methodCall, CtBehavio
getContract().getTargetClass());
contracts.remove(getContract());
for (ContractInfo otherContract : contracts) {
if (getDeclaredMethod(otherContract.getTargetClass(), method.getName(), method.getParameterTypes()) != null) {
preConditionStrengthening(methodCall, method, otherContract.getContractClass());
return;
CtMethod otherMethod = getDeclaredMethod(otherContract.getTargetClass(), method.getName(), method.getParameterTypes());
if (otherMethod != null) {
boolean superPreconditionDefined = false;
Set<ContractMethod> methods = otherContract.getMethods();
for (ContractMethod otherContractMethod : methods) {
if (otherContractMethod.getMethod().equals(otherMethod)) {
if (otherContractMethod.hasPreConditionOrDependencies()) {
superPreconditionDefined = true;
}
}
}
if (superPreconditionDefined) {
preConditionStrengthening(methodCall, method, otherContract.getContractClass());
return;
}
}
}
preConditionAvailable = true;
Expand Down