diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -57,6 +57,11 @@
     LINK_LIBRARIES Qt5::Widgets Qt5::Test okularcore
 )
 
+ecm_add_test(calculatetexttest.cpp
+    TEST_NAME "calculatetexttest"
+    LINK_LIBRARIES Qt5::Widgets Qt5::Test okularcore
+)
+
 if(NOT WIN32)
 	ecm_add_test(mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp
 		TEST_NAME "mainshelltest"
diff --git a/autotests/calculatetexttest.cpp b/autotests/calculatetexttest.cpp
new file mode 100644
--- /dev/null
+++ b/autotests/calculatetexttest.cpp
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   Copyright (C) 2018 by Intevation GmbH <intevation@intevation.de>      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+#include <QtTest>
+
+#include <QMap>
+#include <QMimeType>
+#include <QMimeDatabase>
+#include "../settings_core.h"
+#include "core/document.h"
+#include <core/page.h>
+#include <core/form.h>
+
+class CalculateTextTest: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void testSimpleCalculate();
+
+private:
+    Okular::Document *m_document;
+};
+
+void CalculateTextTest::initTestCase()
+{
+    Okular::SettingsCore::instance( QStringLiteral("calculatetexttest") );
+    m_document = new Okular::Document( nullptr );
+}
+
+void CalculateTextTest::cleanupTestCase()
+{
+    m_document->closeDocument();
+    delete m_document;
+}
+
+void CalculateTextTest::testSimpleCalculate()
+{
+    const QString testFile = QStringLiteral( KDESRCDIR "data/simpleCalculate.pdf" );
+    QMimeDatabase db;
+    const QMimeType mime = db.mimeTypeForFile( testFile );
+    QCOMPARE( m_document->openDocument( testFile, QUrl(), mime), Okular::Document::OpenSuccess );
+
+    const Okular::Page* page = m_document->page( 0 );
+
+    QMap<QString, Okular::FormFieldText *> fields;
+
+    // Field names in test document are:
+    // field1, field2, field3, Sum, AVG, Prod, Min, Max
+
+    for ( Okular::FormField *ff: page->formFields() )
+    {
+        fields.insert( ff->name(), static_cast<Okular::FormFieldText*>( ff ) );
+    }
+
+    // Set some values and do calculation
+    Okular::FormFieldText *field1 = fields[QStringLiteral( "field1" )];
+    QVERIFY( field1 );
+    m_document->editFormText( 0, field1, QStringLiteral( "10" ), 0, 0, 0 );
+
+    Okular::FormFieldText *field2 = fields[QStringLiteral( "field2" )];
+    QVERIFY( field2 );
+    m_document->editFormText( 0, field2, QStringLiteral( "20" ), 0, 0, 0 );
+
+    Okular::FormFieldText *field3 = fields[QStringLiteral( "field3" )];
+    QVERIFY( field3 );
+    m_document->editFormText( 0, field3, QStringLiteral( "30" ), 0, 0, 0 );
+
+    // Verify the results
+    QCOMPARE (fields[QStringLiteral ("Sum")]->text(), QStringLiteral( "60" ));
+    QCOMPARE (fields[QStringLiteral ("AVG")]->text(), QStringLiteral( "20" ));
+    QCOMPARE (fields[QStringLiteral ("Prod")]->text(), QStringLiteral( "6000" ));
+    QCOMPARE (fields[QStringLiteral ("Min")]->text(), QStringLiteral( "10" ));
+    QCOMPARE (fields[QStringLiteral ("Max")]->text(), QStringLiteral( "30" ));
+
+    // Verify that Sum was not recalculated after set without edit
+    QCOMPARE (fields[QStringLiteral ("Sum")]->text(), QStringLiteral( "60" ));
+
+    // Test that multiplication with zero works
+    m_document->editFormText( 0, field2, QStringLiteral( "0" ), 0, 0, 0 );
+    QCOMPARE (fields[QStringLiteral ("Prod")]->text(), QStringLiteral( "0" ));
+
+    // Test that updating the field also worked with sum
+    QCOMPARE (fields[QStringLiteral ("Sum")]->text(), QStringLiteral( "40" ));
+}
+
+QTEST_MAIN( CalculateTextTest )
+#include "calculatetexttest.moc"
diff --git a/autotests/data/simpleCalculate.pdf b/autotests/data/simpleCalculate.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001