diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-05-02 11:05:57 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-05-02 11:09:00 +0200 |
commit | c62a40b368c3f87f2af75038974961e83a48a779 (patch) | |
tree | 557a2e2241ef5d19d4236067dd3c05a868752b7a /juniper/src/test/mcandTestApp.cpp | |
parent | c638dea6f73bb3b250326f2c386b18a2120abfc3 (diff) |
misc cleanup from Baldersheim
* include file cleanup
* only do LOG_SETUP as needed
* remove "virtual" where "override" is specified also
* some minor reformatting and indentation changes
Diffstat (limited to 'juniper/src/test/mcandTestApp.cpp')
-rw-r--r-- | juniper/src/test/mcandTestApp.cpp | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp index 8a93c14cfc9..cb33e503bb5 100644 --- a/juniper/src/test/mcandTestApp.cpp +++ b/juniper/src/test/mcandTestApp.cpp @@ -1,25 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * Definition and implementation of the application for running unit tests - * for the MatchCandidate class in isolation. - * - * @file mcandTestApp.cpp - * - * @author Knut Omang - * - * @date Created 27 Feb 2003 - * - * $Id$ - * - * <pre> - * Copyright (c) : 2003 Fast Search & Transfer ASA - * ALL RIGHTS RESERVED - * </pre> - ****************************************************************************/ -#include <vespa/fastos/fastos.h> -#include <vespa/vespalib/testkit/testapp.h> + #include "mcandTest.h" -#include "testenv.h" +#include <vespa/vespalib/testkit/testapp.h> /** * The MatchCandidateTestApp class is the main routine for running the unit @@ -29,7 +11,7 @@ */ class MatchCandidateTestApp : public vespalib::TestApp { public: - virtual int Main() override { + int Main() override { juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str()); MatchCandidateTest test; test.SetStream(&std::cout); |