From c2f20ad3b67b70400b59cd691515389fcec0cb89 Mon Sep 17 00:00:00 2001 From: garyschulte Date: Fri, 13 Dec 2024 16:45:04 -0800 Subject: [PATCH] rename tests, add some assertions Signed-off-by: garyschulte --- ...sonTest.java => BLS12G1MultiExpComparisonTest.java} | 10 +++++----- ...sonTest.java => BLS12G2MultiExpComparisonTest.java} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/{BLS12G1MultiExpPrecompiledContractComparisonTest.java => BLS12G1MultiExpComparisonTest.java} (94%) rename gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/{BLS12G2MultiExpPrecompiledContractComparisonTest.java => BLS12G2MultiExpComparisonTest.java} (94%) diff --git a/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpPrecompiledContractComparisonTest.java b/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpComparisonTest.java similarity index 94% rename from gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpPrecompiledContractComparisonTest.java rename to gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpComparisonTest.java index eb314def..7c9b2009 100644 --- a/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpPrecompiledContractComparisonTest.java +++ b/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G1MultiExpComparisonTest.java @@ -15,8 +15,6 @@ */ package org.hyperledger.besu.nativelib.gnark; -// - import com.google.common.base.Stopwatch; import com.google.common.io.CharStreams; import org.apache.tuweni.bytes.Bytes; @@ -35,9 +33,9 @@ import static org.hyperledger.besu.nativelib.gnark.LibGnarkEIP2537.EIP2537_PREALLOCATE_FOR_ERROR_BYTES; import static org.hyperledger.besu.nativelib.gnark.LibGnarkEIP2537.EIP2537_PREALLOCATE_FOR_RESULT_BYTES; -@Ignore(value = "This is exploratory to discover performance on various platforms") +//@Ignore(value = "This is exploratory to discover performance on various platforms") @RunWith(Parameterized.class) -public class BLS12G1MultiExpPrecompiledContractComparisonTest { +public class BLS12G1MultiExpComparisonTest { @Parameterized.Parameter(0) public String input; @Parameterized.Parameter(1) @@ -51,7 +49,7 @@ public class BLS12G1MultiExpPrecompiledContractComparisonTest { public static Iterable parameters() throws IOException { return CharStreams.readLines( new InputStreamReader( - BLS12G1MultiExpPrecompiledContractComparisonTest.class + BLS12G1MultiExpComparisonTest.class .getResourceAsStream("g1_multiexp_pair_comparison.csv"), UTF_8)) .stream() @@ -128,6 +126,8 @@ public void shouldCalculate() { if (error1Str.isEmpty()) { assertThat(error1Str).isEqualTo(notes); + assertThat(error2Str).isEqualTo(notes); + assertThat(error3Str).isEqualTo(notes); } else { final Bytes actualComputation1 = Bytes.wrap(output1, 0, 128); final Bytes actualComputation2 = Bytes.wrap(output2, 0, 128); diff --git a/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpPrecompiledContractComparisonTest.java b/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpComparisonTest.java similarity index 94% rename from gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpPrecompiledContractComparisonTest.java rename to gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpComparisonTest.java index d2ca6d30..a380bf11 100644 --- a/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpPrecompiledContractComparisonTest.java +++ b/gnark/src/test/java/org/hyperledger/besu/nativelib/gnark/BLS12G2MultiExpComparisonTest.java @@ -15,8 +15,6 @@ */ package org.hyperledger.besu.nativelib.gnark; -// - import com.google.common.base.Stopwatch; import com.google.common.io.CharStreams; import org.apache.tuweni.bytes.Bytes; @@ -35,9 +33,9 @@ import static org.hyperledger.besu.nativelib.gnark.LibGnarkEIP2537.EIP2537_PREALLOCATE_FOR_ERROR_BYTES; import static org.hyperledger.besu.nativelib.gnark.LibGnarkEIP2537.EIP2537_PREALLOCATE_FOR_RESULT_BYTES; -@Ignore(value = "This is exploratory to discover performance on various platforms") +//@Ignore(value = "This is exploratory to discover performance on various platforms") @RunWith(Parameterized.class) -public class BLS12G2MultiExpPrecompiledContractComparisonTest { +public class BLS12G2MultiExpComparisonTest { @Parameterized.Parameter(0) public String input; @Parameterized.Parameter(1) @@ -51,7 +49,7 @@ public class BLS12G2MultiExpPrecompiledContractComparisonTest { public static Iterable parameters() throws IOException { return CharStreams.readLines( new InputStreamReader( - BLS12G2MultiExpPrecompiledContractComparisonTest.class + BLS12G2MultiExpComparisonTest.class .getResourceAsStream("g2_multiexp_pair_comparison.csv"), UTF_8)) .stream() @@ -128,6 +126,8 @@ public void shouldCalculate() { if (error1Str.isEmpty()) { assertThat(error1Str).isEqualTo(notes); + assertThat(error2Str).isEqualTo(notes); + assertThat(error3Str).isEqualTo(notes); } else { final Bytes actualComputation1 = Bytes.wrap(output1, 0, 256); final Bytes actualComputation2 = Bytes.wrap(output2, 0, 256);