From d59bad87d2b3ce1abf881b0c4e5bbc7648cf368f Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Wed, 2 May 2012 02:30:52 -0400 Subject: remove dependency on gtest, remove all-static --- decoder/hg_test.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'decoder/hg_test.h') 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 -#include -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 "<