diff options
| author | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-02 15:03:24 +0200 |
|---|---|---|
| committer | Patrick Simianer <simianer@cl.uni-heidelberg.de> | 2012-05-02 15:03:24 +0200 |
| commit | 45cb0f7426de97cc181079daf3ca04dbc52dee3c (patch) | |
| tree | abd2158a559480504525082760a618c78847fcf7 /decoder/hg_test.h | |
| parent | 5a8ef8ba65b244837e9cedbd64793b82bf284f93 (diff) | |
| parent | 1c32f3e2831aefdf50fd226d3e1b314c804afc3b (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'decoder/hg_test.h')
| -rw-r--r-- | decoder/hg_test.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/decoder/hg_test.h b/decoder/hg_test.h index 3da6533c..043f970a 100644 --- a/decoder/hg_test.h +++ b/decoder/hg_test.h @@ -5,10 +5,7 @@ #include "hg.h" #include "hg_io.h" #include <sstream> -#include <gtest/gtest.h> -using namespace std; -using namespace testing; #pragma GCC diagnostic ignored "-Wunused-variable" namespace { @@ -25,7 +22,7 @@ Name perro_wts="SameFirstLetter 1 LongerThanPrev 1 ShorterThanPrev 1 GlueTop 0.0 } // you can inherit from this or just use the static methods -struct HGSetup : public Test { +struct HGSetup { enum { HG, HG_int, @@ -43,11 +40,11 @@ struct HGSetup : public Test { static void Json(Hypergraph *hg,std::string const& json) { std::istringstream i(json); - ASSERT_TRUE(HypergraphIO::ReadFromJSON(&i, hg)); + HypergraphIO::ReadFromJSON(&i, hg); } static void JsonFile(Hypergraph *hg,std::string f) { ReadFile rf(f); - ASSERT_TRUE(HypergraphIO::ReadFromJSON(rf.stream(), hg)) << "read from HG file "<<f; + HypergraphIO::ReadFromJSON(rf.stream(), hg); } static void JsonTestFile(Hypergraph *hg,std::string n) { JsonFile(hg,"test_data/"+n); |