From c2b9a61ee2d12932fa3089cf57da0e6e8eb7dd5b Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal@gmail.com>
Date: Tue, 7 Apr 2015 04:51:31 +0200
Subject: [PATCH] * Upd merge test

---
 tests/test_merge.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_merge.py b/tests/test_merge.py
index 1ee9e4cba..39693b178 100644
--- a/tests/test_merge.py
+++ b/tests/test_merge.py
@@ -8,13 +8,13 @@ NLU = English()
 
 
 def test_merge_tokens():
-    tokens = NLU(u'7 a.m. start.')
+    tokens = NLU(u'Los Angeles start.')
     assert len(tokens) == 4
-    assert tokens[0].head.orth_ == 'a.m.'
+    assert tokens[0].head.orth_ == 'Angeles'
     assert tokens[1].head.orth_ == 'start'
-    tokens.merge(0, len('7 a.m.'), 'CD', '7 a.m.', 'TIME')
+    tokens.merge(0, len('Los Angeles'), 'NNP', 'Los Angeles', 'GPE')
     assert len(tokens) == 3
-    assert tokens[0].orth_ == '7 a.m.'
+    assert tokens[0].orth_ == 'Los Angeles'
     assert tokens[0].head.orth_ == 'start'