From 7f07697e890789cf0e4ba41cd8fac9f904f42b88 Mon Sep 17 00:00:00 2001 From: ajlopez Date: Thu, 20 Feb 2014 10:39:01 -0300 Subject: [PATCH] Refactor, rename class, use class method --- Python/Silabeo/silabeo.py | 4 +-- Python/Silabeo/test_silabeo.py | 65 ++++++++++++---------------------- 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/Python/Silabeo/silabeo.py b/Python/Silabeo/silabeo.py index b2f7187..239c5df 100644 --- a/Python/Silabeo/silabeo.py +++ b/Python/Silabeo/silabeo.py @@ -1,6 +1,6 @@ -class Silabeador: - def parse(self, text): +class Silabeo: + def parse(text): result = [] syllable = "" lastsyllable = "" diff --git a/Python/Silabeo/test_silabeo.py b/Python/Silabeo/test_silabeo.py index 597e93e..c8231da 100644 --- a/Python/Silabeo/test_silabeo.py +++ b/Python/Silabeo/test_silabeo.py @@ -1,159 +1,138 @@ import unittest -from silabeo import Silabeador +from silabeo import Silabeo class SilabeadorTests(unittest.TestCase): def test_one_vowel(self): - sil = Silabeador() - result = sil.parse("a") + result = Silabeo.parse("a") self.assertEqual(1, len(result)) self.assertEqual("a", result[0]) def test_consonant_vowel(self): - sil = Silabeador() - result = sil.parse("la") + result = Silabeo.parse("la") self.assertEqual(1, len(result)) self.assertEqual("la", result[0]) def test_consonant_vowel_consonant_vowel(self): - sil = Silabeador() - result = sil.parse("sala") + result = Silabeo.parse("sala") self.assertEqual(2, len(result)) self.assertEqual("sa", result[0]) self.assertEqual("la", result[1]) def test_consonant_vowel_consonant_othervowel(self): - sil = Silabeador() - result = sil.parse("sale") + result = Silabeo.parse("sale") self.assertEqual(2, len(result)) self.assertEqual("sa", result[0]) self.assertEqual("le", result[1]) def test_consonant_vowel_doubleconsonant_othervowel(self): - sil = Silabeador() - result = sil.parse("carro") + result = Silabeo.parse("carro") self.assertEqual(2, len(result)) self.assertEqual("ca", result[0]) self.assertEqual("rro", result[1]) def test_word_having_ivowel(self): - sil = Silabeador() - result = sil.parse("carrito") + result = Silabeo.parse("carrito") self.assertEqual(3, len(result)) self.assertEqual("ca", result[0]) self.assertEqual("rri", result[1]) self.assertEqual("to", result[2]) def test_word_having_uvowel(self): - sil = Silabeador() - result = sil.parse("curro") + result = Silabeo.parse("curro") self.assertEqual(2, len(result)) self.assertEqual("cu", result[0]) self.assertEqual("rro", result[1]) def test_word_having_initial_vowel(self): - sil = Silabeador() - result = sil.parse("alaba") + result = Silabeo.parse("alaba") self.assertEqual(3, len(result)) self.assertEqual("a", result[0]) self.assertEqual("la", result[1]) self.assertEqual("ba", result[2]) def test_word_having_syllable_ending_with_rconsonant(self): - sil = Silabeador() - result = sil.parse("alabar") + result = Silabeo.parse("alabar") self.assertEqual(3, len(result)) self.assertEqual("a", result[0]) self.assertEqual("la", result[1]) self.assertEqual("bar", result[2]) def test_word_having_syllable_ending_with_lconsonant(self): - sil = Silabeador() - result = sil.parse("alto") + result = Silabeo.parse("alto") self.assertEqual(2, len(result)) self.assertEqual("al", result[0]) self.assertEqual("to", result[1]) def test_dyphthong(self): - sil = Silabeador() - result = sil.parse("paisaje") + result = Silabeo.parse("paisaje") self.assertEqual(3, len(result)) self.assertEqual("pai", result[0]) self.assertEqual("sa", result[1]) self.assertEqual("je", result[2]) def test_false_dyphthong(self): - sil = Silabeador() - result = sil.parse("poema") + result = Silabeo.parse("poema") self.assertEqual(3, len(result)) self.assertEqual("po", result[0]) self.assertEqual("e", result[1]) self.assertEqual("ma", result[2]) def test_word_ending_with_dconsonant(self): - sil = Silabeador() - result = sil.parse("ciudad") + result = Silabeo.parse("ciudad") self.assertEqual(2, len(result)) self.assertEqual("ciu", result[0]) self.assertEqual("dad", result[1]) def test_word_ending_with_aacute(self): - sil = Silabeador() - result = sil.parse("álamo") + result = Silabeo.parse("álamo") self.assertEqual(3, len(result)) self.assertEqual("á", result[0]) self.assertEqual("la", result[1]) self.assertEqual("mo", result[2]) def test_acute_open_vowel_in_false_diphtong(self): - sil = Silabeador() - result = sil.parse("ríos") + result = Silabeo.parse("ríos") self.assertEqual(2, len(result)) self.assertEqual("rí", result[0]) self.assertEqual("os", result[1]) def test_udieresis(self): - sil = Silabeador() - result = sil.parse("santigüar") + result = Silabeo.parse("santigüar") self.assertEqual(3, len(result)) self.assertEqual("san", result[0]) self.assertEqual("ti", result[1]) self.assertEqual("güar", result[2]) def test_soft_gconsontante_vowel(self): - sil = Silabeador() - result = sil.parse("guisante") + result = Silabeo.parse("guisante") self.assertEqual(3, len(result)) self.assertEqual("gui", result[0]) self.assertEqual("san", result[1]) self.assertEqual("te", result[2]) def test_sconsonant_ending_syllable(self): - sil = Silabeador() - result = sil.parse("desastre") + result = Silabeo.parse("desastre") self.assertEqual(3, len(result)) self.assertEqual("de", result[0]) self.assertEqual("sas", result[1]) self.assertEqual("tre", result[2]) def test_yconsonant_ending_word(self): - sil = Silabeador() - result = sil.parse("Paraguay") + result = Silabeo.parse("Paraguay") self.assertEqual(3, len(result)) self.assertEqual("Pa", result[0]) self.assertEqual("ra", result[1]) self.assertEqual("guay", result[2]) def test_yconsonant_ending_syllable(self): - sil = Silabeador() - result = sil.parse("Huayco") + result = Silabeo.parse("Huayco") self.assertEqual(2, len(result)) self.assertEqual("Huay", result[0]) self.assertEqual("co", result[1]) def test_simple_triphthong(self): - sil = Silabeador() - result = sil.parse("hioides") + result = Silabeo.parse("hioides") self.assertEqual(2, len(result)) self.assertEqual("hioi", result[0]) self.assertEqual("des", result[1])