From 5718299276a6966eddc2f3fb5948a6dd1bbdef90 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 12 Oct 2012 01:59:36 +0200 Subject: [PATCH 1/1] Split test utilities out into its own file. --- Makefile | 8 ++-- effect_chain_test.cpp | 93 +------------------------------------------ test_util.cpp | 84 ++++++++++++++++++++++++++++++++++++++ test_util.h | 19 +++++++++ 4 files changed, 109 insertions(+), 95 deletions(-) create mode 100644 test_util.cpp create mode 100644 test_util.h diff --git a/Makefile b/Makefile index c297455..0ebb884 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,8 @@ LIB_OBJS += sandbox_effect.o # Default target: all: $(TESTS) demo -# Google Test. -GTEST_OBJS = gtest-all.o gtest_sdl_main.o +# Google Test and other test library functions. +TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ @@ -46,8 +46,8 @@ gtest_sdl_main.o: gtest_sdl_main.cpp $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@ # Unit tests. -effect_chain_test: effect_chain_test.o $(GTEST_OBJS) libmovit.a - $(CXX) -o $@ effect_chain_test.o $(GTEST_OBJS) libmovit.a $(LDFLAGS) +effect_chain_test: effect_chain_test.o $(TEST_OBJS) libmovit.a + $(CXX) -o $@ effect_chain_test.o $(TEST_OBJS) libmovit.a $(LDFLAGS) OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(GDEMO_OBJS) diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp index a85fb36..e5ca1cc 100644 --- a/effect_chain_test.cpp +++ b/effect_chain_test.cpp @@ -4,99 +4,10 @@ #include "effect_chain.h" #include "flat_input.h" +#include "gtest/gtest.h" #include "mirror_effect.h" #include "opengl.h" -#include "gtest/gtest.h" - -#include -#include - -#include - -class EffectChainTester { -public: - EffectChainTester(const float *data, unsigned width, unsigned height, ColorSpace color_space, GammaCurve gamma_curve) - : chain(width, height), width(width), height(height) - { - ImageFormat format; - format.color_space = color_space; - format.gamma_curve = gamma_curve; - - FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, width, height); - input->set_pixel_data(data); - chain.add_input(input); - } - - EffectChain *get_chain() { return &chain; } - - void run(float *out_data, ColorSpace color_space, GammaCurve gamma_curve) - { - ImageFormat format; - format.color_space = color_space; - format.gamma_curve = gamma_curve; - chain.add_output(format); - chain.finalize(); - - glViewport(0, 0, width, height); - chain.render_to_screen(); - - glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data); - - // Flip upside-down to compensate for different origin. - for (unsigned y = 0; y < height / 2; ++y) { - unsigned flip_y = height - y - 1; - for (unsigned x = 0; x < width; ++x) { - std::swap(out_data[y * width + x], out_data[flip_y * width + x]); - } - } - } - -private: - EffectChain chain; - unsigned width, height; -}; - -void expect_equal(const float *ref, const float *result, unsigned width, unsigned height) -{ - float largest_difference = -1.0f; - float squared_difference = 0.0f; - - for (unsigned y = 0; y < height; ++y) { - for (unsigned x = 0; x < width; ++x) { - float diff = ref[y * width + x] - result[y * width + x]; - largest_difference = std::max(largest_difference, fabsf(diff)); - squared_difference += diff * diff; - } - } - - const float largest_difference_limit = 1.5 / 255.0; - const float rms_limit = 0.5 / 255.0; - - EXPECT_LT(largest_difference, largest_difference_limit); - - float rms = sqrt(squared_difference) / (width * height); - EXPECT_LT(rms, rms_limit); - - if (largest_difference >= largest_difference_limit || rms >= rms_limit) { - fprintf(stderr, "Dumping matrices for easier debugging, since at least one test failed.\n"); - - fprintf(stderr, "Reference:\n"); - for (unsigned y = 0; y < height; ++y) { - for (unsigned x = 0; x < width; ++x) { - fprintf(stderr, "%7.4f ", ref[y * width + x]); - } - fprintf(stderr, "\n"); - } - - fprintf(stderr, "\nResult:\n"); - for (unsigned y = 0; y < height; ++y) { - for (unsigned x = 0; x < width; ++x) { - fprintf(stderr, "%7.4f ", result[y * width + x]); - } - fprintf(stderr, "\n"); - } - } -} +#include "test_util.h" TEST(EffectChainTest, EmptyChain) { float data[] = { diff --git a/test_util.cpp b/test_util.cpp new file mode 100644 index 0000000..a52eb79 --- /dev/null +++ b/test_util.cpp @@ -0,0 +1,84 @@ +#include "test_util.h" +#include "flat_input.h" +#include "gtest/gtest.h" + +#include +#include + +#include + +EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height, ColorSpace color_space, GammaCurve gamma_curve) + : chain(width, height), width(width), height(height) +{ + ImageFormat format; + format.color_space = color_space; + format.gamma_curve = gamma_curve; + + FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, width, height); + input->set_pixel_data(data); + chain.add_input(input); +} + +void EffectChainTester::run(float *out_data, ColorSpace color_space, GammaCurve gamma_curve) +{ + ImageFormat format; + format.color_space = color_space; + format.gamma_curve = gamma_curve; + chain.add_output(format); + chain.finalize(); + + glViewport(0, 0, width, height); + chain.render_to_screen(); + + glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data); + + // Flip upside-down to compensate for different origin. + for (unsigned y = 0; y < height / 2; ++y) { + unsigned flip_y = height - y - 1; + for (unsigned x = 0; x < width; ++x) { + std::swap(out_data[y * width + x], out_data[flip_y * width + x]); + } + } +} + +void expect_equal(const float *ref, const float *result, unsigned width, unsigned height) +{ + float largest_difference = -1.0f; + float squared_difference = 0.0f; + + for (unsigned y = 0; y < height; ++y) { + for (unsigned x = 0; x < width; ++x) { + float diff = ref[y * width + x] - result[y * width + x]; + largest_difference = std::max(largest_difference, fabsf(diff)); + squared_difference += diff * diff; + } + } + + const float largest_difference_limit = 1.5 / 255.0; + const float rms_limit = 0.5 / 255.0; + + EXPECT_LT(largest_difference, largest_difference_limit); + + float rms = sqrt(squared_difference) / (width * height); + EXPECT_LT(rms, rms_limit); + + if (largest_difference >= largest_difference_limit || rms >= rms_limit) { + fprintf(stderr, "Dumping matrices for easier debugging, since at least one test failed.\n"); + + fprintf(stderr, "Reference:\n"); + for (unsigned y = 0; y < height; ++y) { + for (unsigned x = 0; x < width; ++x) { + fprintf(stderr, "%7.4f ", ref[y * width + x]); + } + fprintf(stderr, "\n"); + } + + fprintf(stderr, "\nResult:\n"); + for (unsigned y = 0; y < height; ++y) { + for (unsigned x = 0; x < width; ++x) { + fprintf(stderr, "%7.4f ", result[y * width + x]); + } + fprintf(stderr, "\n"); + } + } +} diff --git a/test_util.h b/test_util.h new file mode 100644 index 0000000..ed0275e --- /dev/null +++ b/test_util.h @@ -0,0 +1,19 @@ +#ifndef _TEST_UTIL_H +#define _TEST_UTIL_H 1 + +#include "effect_chain.h" + +class EffectChainTester { +public: + EffectChainTester(const float *data, unsigned width, unsigned height, ColorSpace color_space, GammaCurve gamma_curve); + EffectChain *get_chain() { return &chain; } + void run(float *out_data, ColorSpace color_space, GammaCurve gamma_curve); + +private: + EffectChain chain; + unsigned width, height; +}; + +void expect_equal(const float *ref, const float *result, unsigned width, unsigned height); + +#endif // !defined(_TEST_UTIL_H) -- 2.39.2