Skip to content

Commit

Permalink
chore: Reinstate skipped tests (#8743)
Browse files Browse the repository at this point in the history 
These are quite stable but ofc it's better not to skip them...
  • Loading branch information
@codygunton
codygunton authored Sep 24, 2024
1 parent e85bee5 commit 18e2697
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 67 deletions.
20 changes: 10 additions & 10 deletions barretenberg/cpp/src/barretenberg/stdlib/plonk_recursion/verifier/verifier.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace bb::stdlib {

template <typename OuterComposer> class stdlib_verifier_SKIP_CI : public testing::Test {
template <typename OuterComposer> class stdlib_verifier : public testing::Test {

using InnerComposer = plonk::UltraComposer;
using InnerBuilder = typename InnerComposer::CircuitBuilder;
Expand Down Expand Up @@ -562,19 +562,19 @@ template <typename OuterComposer> class stdlib_verifier_SKIP_CI : public testing

typedef testing::Types<plonk::StandardComposer, plonk::UltraComposer> OuterComposerTypes;

TYPED_TEST_SUITE(stdlib_verifier_SKIP_CI, OuterComposerTypes);
TYPED_TEST_SUITE(stdlib_verifier, OuterComposerTypes);

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, test_inner_circuit)
HEAVY_TYPED_TEST(stdlib_verifier, test_inner_circuit)
{
TestFixture::test_inner_circuit();
}

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition)
{
TestFixture::test_recursive_proof_composition();
};

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_ultra_no_tables)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_ultra_no_tables)
{
if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
TestFixture::test_recursive_proof_composition_ultra_no_tables();
Expand All @@ -583,7 +583,7 @@ HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_ultra_no_t
}
};

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, double_verification)
HEAVY_TYPED_TEST(stdlib_verifier, double_verification)
{
if constexpr (std::same_as<TypeParam, plonk::UltraComposer>) {
TestFixture::test_double_verification();
Expand All @@ -593,22 +593,22 @@ HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, double_verification)
}
};

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_with_variable_verification_key_a)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_a)
{
TestFixture::test_recursive_proof_composition_with_variable_verification_key_a();
}

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_with_variable_verification_key_b)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_with_variable_verification_key_b)
{
TestFixture::test_recursive_proof_composition_with_variable_verification_key_b();
}

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_var_verif_key_fail)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_var_verif_key_fail)
{
TestFixture::test_recursive_proof_composition_with_variable_verification_key_failure_case();
}

HEAVY_TYPED_TEST(stdlib_verifier_SKIP_CI, recursive_proof_composition_const_verif_key)
HEAVY_TYPED_TEST(stdlib_verifier, recursive_proof_composition_const_verif_key)
{
TestFixture::test_recursive_proof_composition_with_constant_verification_key();
}
Expand Down
50 changes: 25 additions & 25 deletions barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace {
auto& engine = numeric::get_debug_randomness();
}

template <typename Builder> class stdlib_bigfield_SKIP_CI : public testing::Test {
template <typename Builder> class stdlib_bigfield : public testing::Test {

typedef stdlib::bn254<Builder> bn254;

Expand Down Expand Up @@ -918,101 +918,101 @@ template <typename Builder> class stdlib_bigfield_SKIP_CI : public testing::Test
// Define types for which the above tests will be constructed.
using CircuitTypes = testing::Types<bb::StandardCircuitBuilder, bb::UltraCircuitBuilder, bb::CircuitSimulatorBN254>;
// Define the suite of tests.
TYPED_TEST_SUITE(stdlib_bigfield_SKIP_CI, CircuitTypes);
TYPED_TEST(stdlib_bigfield_SKIP_CI, badmul)
TYPED_TEST_SUITE(stdlib_bigfield, CircuitTypes);
TYPED_TEST(stdlib_bigfield, badmul)
{
TestFixture::test_division_formula_bug();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, mul)
TYPED_TEST(stdlib_bigfield, mul)
{
TestFixture::test_mul();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, sqr)
TYPED_TEST(stdlib_bigfield, sqr)
{
TestFixture::test_sqr();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, mult_madd)
TYPED_TEST(stdlib_bigfield, mult_madd)
{
TestFixture::test_mult_madd();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, dual_madd)
TYPED_TEST(stdlib_bigfield, dual_madd)
{
TestFixture::test_dual_madd();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, div_without_denominator_check)
TYPED_TEST(stdlib_bigfield, div_without_denominator_check)
{
TestFixture::test_div();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, add_and_div)
TYPED_TEST(stdlib_bigfield, add_and_div)
{
TestFixture::test_add_and_div();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, add_and_mul)
TYPED_TEST(stdlib_bigfield, add_and_mul)
{
TestFixture::test_add_and_mul();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, add_and_mul_with_constants)
TYPED_TEST(stdlib_bigfield, add_and_mul_with_constants)
{
TestFixture::test_add_and_mul_with_constants();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, sub_and_mul)
TYPED_TEST(stdlib_bigfield, sub_and_mul)
{
TestFixture::test_sub_and_mul();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, msub_div)
TYPED_TEST(stdlib_bigfield, msub_div)
{
TestFixture::test_msub_div();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, conditional_negate)
TYPED_TEST(stdlib_bigfield, conditional_negate)
{
TestFixture::test_conditional_negate();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, group_operations)
TYPED_TEST(stdlib_bigfield, group_operations)
{
TestFixture::test_group_operations();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, reduce)
TYPED_TEST(stdlib_bigfield, reduce)
{
TestFixture::test_reduce();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, assert_is_in_field_succes)
TYPED_TEST(stdlib_bigfield, assert_is_in_field_succes)
{
TestFixture::test_assert_is_in_field_success();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, assert_less_than_success)
TYPED_TEST(stdlib_bigfield, assert_less_than_success)
{
TestFixture::test_assert_less_than_success();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, byte_array_constructors)
TYPED_TEST(stdlib_bigfield, byte_array_constructors)
{
TestFixture::test_byte_array_constructors();
}
TYPED_TEST(stdlib_bigfield_SKIP_CI, quotient_completeness_regression)
TYPED_TEST(stdlib_bigfield, quotient_completeness_regression)
{
TestFixture::test_quotient_completeness();
}

TYPED_TEST(stdlib_bigfield_SKIP_CI, conditional_select_regression)
TYPED_TEST(stdlib_bigfield, conditional_select_regression)
{
TestFixture::test_conditional_select_regression();
}

TYPED_TEST(stdlib_bigfield_SKIP_CI, division_context)
TYPED_TEST(stdlib_bigfield, division_context)
{
TestFixture::test_division_context();
}

TYPED_TEST(stdlib_bigfield_SKIP_CI, inverse)
TYPED_TEST(stdlib_bigfield, inverse)
{
TestFixture::test_inversion();
}

TYPED_TEST(stdlib_bigfield_SKIP_CI, assert_equal_not_equal)
TYPED_TEST(stdlib_bigfield, assert_equal_not_equal)
{
TestFixture::test_assert_equal_not_equal();
}

TYPED_TEST(stdlib_bigfield_SKIP_CI, pow)
TYPED_TEST(stdlib_bigfield, pow)
{
TestFixture::test_pow();
}
Expand Down
Loading

0 comments on commit 18e2697

Please sign in to comment.