[PATCH v2 2/9] test: ipa: libipa: Add tets for Interpolator

[Kieran Bingham]

Quoting Kieran Bingham (2024-09-13 10:06:00)
> Quoting Stefan Klug (2024-09-13 08:57:20)
> > Add tests for the Interpolator class.
> > 
> > Signed-off-by: Stefan Klug <stefan.klug at ideasonboard.com>
> > ---
> >  test/ipa/libipa/interpolator.cpp | 55 ++++++++++++++++++++++++++++++++
> >  test/ipa/libipa/meson.build      | 15 +++++++++
> >  test/ipa/meson.build             |  1 +
> >  3 files changed, 71 insertions(+)
> >  create mode 100644 test/ipa/libipa/interpolator.cpp
> >  create mode 100644 test/ipa/libipa/meson.build
> > 
> > diff --git a/test/ipa/libipa/interpolator.cpp b/test/ipa/libipa/interpolator.cpp
> > new file mode 100644
> > index 000000000000..adb215386f0e
> > --- /dev/null
> > +++ b/test/ipa/libipa/interpolator.cpp
> > @@ -0,0 +1,55 @@
> > +/* SPDX-License-Identifier: GPL-2.0-or-later */
> > +/*
> > + * Copyright (C) 2024, Paul Elder <paul.elder at ideasonboard.com>

I think you can claim this though if you prefer ;-)

> > + *
> > + * Miscellaneous utility tests
> > + */
> > +
> > +#include <cmath>
> > +#include <iostream>
> > +#include <map>
> > +#include <stdint.h>
> > +#include <stdio.h>
> > +
> > +#include "../src/ipa/libipa/interpolator.h"
> > +
> > +#include "test.h"
> > +
> > +using namespace std;
> > +using namespace libcamera;
> > +using namespace ipa;
> > +
> > +#define ASSERT_EQ(a, b) \
> > +       if((a) != (b)) { printf(#a  " != " #b "\n"); \
> > +               return TestFail; \
> 
> We wouldn't normally hide return statements in a macro - but given the
> small scope of the macro here, and how it helps improve readability, and
> we're in tests- I think it's fine, and helpful
> 
> 
> 
> > +       }
> > +
> > +class InterpolatorTest : public Test
> > +{
> > +protected:
> > +
> > +       int run()
> > +       {
> > +               Interpolator<int> interpolator;
> > +               interpolator.setData({{10,100},{20,200},{30,300}});
> > +
> > +               ASSERT_EQ(interpolator.getInterpolated(0), 100);
> > +               ASSERT_EQ(interpolator.getInterpolated(10), 100);
> > +               ASSERT_EQ(interpolator.getInterpolated(20), 200);
> > +               ASSERT_EQ(interpolator.getInterpolated(25), 250);
> > +               ASSERT_EQ(interpolator.getInterpolated(30), 300);
> > +               ASSERT_EQ(interpolator.getInterpolated(40), 300);
> > +
> > +               interpolator.setQuantization(10);
> > +               unsigned int q = 0;
> > +               ASSERT_EQ(interpolator.getInterpolated(25, &q), 300);
> > +               ASSERT_EQ(q, 30);
> > +               ASSERT_EQ(interpolator.getInterpolated(24, &q), 200);
> > +               ASSERT_EQ(q, 20);
> > +               
> 
> nit: Delete a blank line
> 
> Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
> 
> > +
> > +               return TestPass;
> > +       }
> > +};
> > +
> > +TEST_REGISTER(InterpolatorTest)
> > diff --git a/test/ipa/libipa/meson.build b/test/ipa/libipa/meson.build
> > new file mode 100644
> > index 000000000000..4d2427dbd4e7
> > --- /dev/null
> > +++ b/test/ipa/libipa/meson.build
> > @@ -0,0 +1,15 @@
> > +# SPDX-License-Identifier: CC0-1.0
> > +
> > +libipa_test = [
> > +    {'name': 'interpolator', 'sources': ['interpolator.cpp']},
> > +]
> > +
> > +foreach test : libipa_test
> > +    exe = executable(test['name'], test['sources'],
> > +                     dependencies : [libcamera_private, libipa_dep],
> > +                     link_with : [test_libraries],
> > +                     include_directories : [test_includes_internal,
> > +                                            '../../../src/ipa/libipa/'])
> > +
> > +    test(test['name'], exe, suite : 'ipa')
> > +endforeach
> > diff --git a/test/ipa/meson.build b/test/ipa/meson.build
> > index e9871aba44ee..63820de54899 100644
> > --- a/test/ipa/meson.build
> > +++ b/test/ipa/meson.build
> > @@ -1,5 +1,6 @@
> >  # SPDX-License-Identifier: CC0-1.0
> >  
> > +subdir('libipa')
> >  subdir('rkisp1')
> >  
> >  ipa_test = [
> > -- 
> > 2.43.0
> >