From 637d7a3b00914a9bbedbfd8bc009f80dace5c493 Mon Sep 17 00:00:00 2001 From: Sven Meyer Date: Tue, 7 Oct 2025 12:59:35 +0200 Subject: [PATCH] Fix assertion extraction in CryptoAnalysis tests --- CryptoAnalysis/src/test/java/test/TestRunner.java | 11 ++++++++--- .../src/test/java/tests/jca/SecretKeyTest.java | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CryptoAnalysis/src/test/java/test/TestRunner.java b/CryptoAnalysis/src/test/java/test/TestRunner.java index 18e71aac9..fdd2389df 100644 --- a/CryptoAnalysis/src/test/java/test/TestRunner.java +++ b/CryptoAnalysis/src/test/java/test/TestRunner.java @@ -196,9 +196,14 @@ private void extractBenchmarkMethods( } visited.add(method); - for (CallGraph.Edge callSite : callGraph.edgesInto(method)) { - Method callee = callSite.tgt(); - extractBenchmarkMethods(callee, callGraph, queries, visited); + for (Statement statement : method.getStatements()) { + for (CallGraph.Edge edge : callGraph.edgesOutOf(statement)) { + Method callee = edge.tgt(); + + if (callee.isDefined()) { + extractBenchmarkMethods(callee, callGraph, queries, visited); + } + } } for (Statement statement : method.getStatements()) { diff --git a/CryptoAnalysis/src/test/java/tests/jca/SecretKeyTest.java b/CryptoAnalysis/src/test/java/tests/jca/SecretKeyTest.java index 58ec77301..f4275d341 100644 --- a/CryptoAnalysis/src/test/java/tests/jca/SecretKeyTest.java +++ b/CryptoAnalysis/src/test/java/tests/jca/SecretKeyTest.java @@ -288,7 +288,7 @@ public Encryptor() throws GeneralSecurityException { public byte[] encrypt(String plainText) throws GeneralSecurityException { byte[] encText = this.cipher.doFinal(plainText.getBytes()); - Assertions.hasEnsuredPredicate(encText); + Assertions.notHasEnsuredPredicate(encText); return encText; } }