summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-06-02 17:19:08 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-06-02 17:19:08 -0700
commitd384012307881898a2df49f68fa6b46a4cd9972d (patch)
tree31706c65b8c56083a151470721cf36e8bb46939d
parent9f129a8711f9bb71ee7cf6c13f7965926255c975 (diff)
elementary: merging in elm_code widget.
Theme is not there as it should be manually merged into the elementary default theme.
-rw-r--r--legacy/elm_code/src/tests/elm_code_suite.c130
-rw-r--r--legacy/elm_code/src/tests/elm_code_suite.h31
-rw-r--r--src/Makefile_Elementary.am46
-rw-r--r--src/lib/elementary/Elementary.h.in1
-rw-r--r--src/lib/elementary/elm_code.c (renamed from legacy/elm_code/src/lib/elm_code.c)4
-rw-r--r--src/lib/elementary/elm_code.h (renamed from legacy/elm_code/src/lib/Elm_Code.h)38
-rw-r--r--src/lib/elementary/elm_code_common.h (renamed from legacy/elm_code/src/lib/elm_code_common.h)0
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c (renamed from legacy/elm_code/src/lib/elm_code_diff_widget.c)6
-rw-r--r--src/lib/elementary/elm_code_diff_widget.h (renamed from legacy/elm_code/src/lib/elm_code_diff_widget.h)0
-rw-r--r--src/lib/elementary/elm_code_file.c (renamed from legacy/elm_code/src/lib/elm_code_file.c)7
-rw-r--r--src/lib/elementary/elm_code_file.h (renamed from legacy/elm_code/src/lib/elm_code_file.h)0
-rw-r--r--src/lib/elementary/elm_code_line.c (renamed from legacy/elm_code/src/lib/elm_code_line.c)6
-rw-r--r--src/lib/elementary/elm_code_line.h (renamed from legacy/elm_code/src/lib/elm_code_line.h)0
-rw-r--r--src/lib/elementary/elm_code_parse.c (renamed from legacy/elm_code/src/lib/elm_code_parse.c)6
-rw-r--r--src/lib/elementary/elm_code_parse.h (renamed from legacy/elm_code/src/lib/elm_code_parse.h)0
-rw-r--r--src/lib/elementary/elm_code_private.h (renamed from legacy/elm_code/src/lib/elm_code_private.h)0
-rw-r--r--src/lib/elementary/elm_code_text.c (renamed from legacy/elm_code/src/lib/elm_code_text.c)6
-rw-r--r--src/lib/elementary/elm_code_text.h (renamed from legacy/elm_code/src/lib/elm_code_text.h)0
-rw-r--r--src/lib/elementary/elm_code_widget.c (renamed from legacy/elm_code/src/lib/widget/elm_code_widget.c)9
-rw-r--r--src/lib/elementary/elm_code_widget.eo (renamed from legacy/elm_code/src/lib/widget/elm_code_widget.eo)1
-rw-r--r--src/lib/elementary/elm_code_widget_legacy.h (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_legacy.h)2
-rw-r--r--src/lib/elementary/elm_code_widget_private.h (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_private.h)0
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_selection.c)6
-rw-r--r--src/lib/elementary/elm_code_widget_selection.h (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_selection.h)0
-rw-r--r--src/lib/elementary/elm_code_widget_text.c (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_text.c)6
-rw-r--r--src/lib/elementary/elm_code_widget_undo.c (renamed from legacy/elm_code/src/lib/widget/elm_code_widget_undo.c)6
-rw-r--r--src/tests/elementary/elm_code_file_test_load.c (renamed from legacy/elm_code/src/tests/elm_code_file_test_load.c)36
-rw-r--r--src/tests/elementary/elm_code_file_test_memory.c (renamed from legacy/elm_code/src/tests/elm_code_file_test_memory.c)12
-rw-r--r--src/tests/elementary/elm_code_test_basic.c (renamed from legacy/elm_code/src/tests/elm_code_test_basic.c)12
-rw-r--r--src/tests/elementary/elm_code_test_line.c (renamed from legacy/elm_code/src/tests/elm_code_test_line.c)14
-rw-r--r--src/tests/elementary/elm_code_test_parse.c (renamed from legacy/elm_code/src/tests/elm_code_test_parse.c)16
-rw-r--r--src/tests/elementary/elm_code_test_text.c (renamed from legacy/elm_code/src/tests/elm_code_test_text.c)23
-rw-r--r--src/tests/elementary/elm_code_test_widget.c (renamed from legacy/elm_code/src/tests/widget/elm_code_test_widget.c)9
-rw-r--r--src/tests/elementary/elm_code_test_widget_selection.c (renamed from legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c)14
-rw-r--r--src/tests/elementary/elm_code_test_widget_text.c (renamed from legacy/elm_code/src/tests/widget/elm_code_test_widget_text.c)9
-rw-r--r--src/tests/elementary/elm_code_test_widget_undo.c (renamed from legacy/elm_code/src/tests/widget/elm_code_test_widget_undo.c)7
-rw-r--r--src/tests/elementary/elm_suite.c9
-rw-r--r--src/tests/elementary/elm_suite.h11
-rw-r--r--src/tests/elementary/elm_test_helper.h13
-rw-r--r--src/tests/elementary/testdiff.diff (renamed from legacy/elm_code/src/tests/testdiff.diff)0
-rw-r--r--src/tests/elementary/testfile-windows.txt (renamed from legacy/elm_code/src/tests/testfile-windows.txt)0
-rw-r--r--src/tests/elementary/testfile-withblanks.txt (renamed from legacy/elm_code/src/tests/testfile-withblanks.txt)0
-rw-r--r--src/tests/elementary/testfile.txt (renamed from legacy/elm_code/src/tests/testfile.txt)0
43 files changed, 225 insertions, 271 deletions
diff --git a/legacy/elm_code/src/tests/elm_code_suite.c b/legacy/elm_code/src/tests/elm_code_suite.c
deleted file mode 100644
index 31ea7d9..0000000
--- a/legacy/elm_code/src/tests/elm_code_suite.c
+++ /dev/null
@@ -1,130 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "config.h"
3#endif
4
5#include <Ecore_Getopt.h>
6
7#include "Elm_Code.h"
8#include "elm_code_suite.h"
9
10#define COPYRIGHT "Copyright © 2014 Andy Williams <andy@andyilliams.me> and various contributors (see AUTHORS)."
11
12static const struct {
13 const char *name;
14 void (*build)(TCase *tc);
15} tests[] = {
16 { "file_load", elm_code_file_test_load },
17 { "file_memory", elm_code_file_test_memory },
18 { "parse", elm_code_test_parse },
19 { "text", elm_code_test_text },
20 { "basic", elm_code_test_basic },
21 { "widget", elm_code_test_widget },
22 { "widget_text", elm_code_test_widget_text },
23 { "widget_selection", elm_code_test_widget_selection },
24 { "widget_undo", elm_code_test_widget_undo },
25};
26
27START_TEST(elm_code_initialization)
28{
29 fail_if(elm_code_init() != 1);
30
31// TODO add other init checks here
32
33 fail_if(elm_code_shutdown() != 0);
34}
35END_TEST
36
37void
38edi_test_basic(TCase *tc)
39{
40 tcase_add_test(tc, elm_code_initialization);
41}
42
43static const Ecore_Getopt optdesc = {
44 "elm_code",
45 "%prog [options]",
46 PACKAGE_VERSION,
47 COPYRIGHT,
48 "BSD with advertisement clause",
49 "Elm Code",
50 0,
51 {
52 ECORE_GETOPT_STORE_TRUE('l', "list", "list available tests"),
53 ECORE_GETOPT_STORE_STR('t', "test", "test to run"),
54 ECORE_GETOPT_LICENSE('L', "license"),
55 ECORE_GETOPT_COPYRIGHT('C', "copyright"),
56 ECORE_GETOPT_VERSION('V', "version"),
57 ECORE_GETOPT_HELP('h', "help"),
58 ECORE_GETOPT_SENTINEL
59 }
60};
61
62int
63main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
64{
65 Suite *s;
66 SRunner *sr;
67 TCase *tc = NULL;
68 char *test = NULL;
69 unsigned int i;
70 int failed_count = -1;
71 int args;
72 Eina_Bool quit_option = EINA_FALSE;
73 Eina_Bool list_option = EINA_FALSE;
74
75 Ecore_Getopt_Value values[] = {
76 ECORE_GETOPT_VALUE_BOOL(list_option),
77 ECORE_GETOPT_VALUE_STR(test),
78 ECORE_GETOPT_VALUE_BOOL(quit_option),
79 ECORE_GETOPT_VALUE_BOOL(quit_option),
80 ECORE_GETOPT_VALUE_BOOL(quit_option),
81 ECORE_GETOPT_VALUE_BOOL(quit_option),
82 ECORE_GETOPT_VALUE_NONE
83 };
84
85 eina_init();
86
87 args = ecore_getopt_parse(&optdesc, values, argc, argv);
88 if (args < 0)
89 {
90 EINA_LOG_CRIT("Could not parse arguments.");
91 goto end;
92 }
93 else if (quit_option)
94 {
95 goto end;
96 }
97 else if (list_option)
98 {
99 fprintf(stdout, "Available tests :\n");
100 for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++)
101 fprintf(stdout, "\t%s\n", tests[i].name);
102 goto end;
103 }
104
105 s = suite_create("Elm_Code");
106
107 for (i = 0; i < sizeof (tests) / sizeof (tests[0]); i++)
108 {
109 if (test && strcmp(tests[i].name, test))
110 continue ;
111
112 tc = tcase_create(tests[i].name);
113 tcase_set_timeout(tc, 0);
114
115 tests[i].build(tc);
116 suite_add_tcase(s, tc);
117 }
118
119 sr = srunner_create(s);
120 srunner_set_xml(sr, PACKAGE_BUILD_DIR "/check-results.xml");
121
122 srunner_run_all(sr, CK_ENV);
123 failed_count = srunner_ntests_failed(sr);
124 srunner_free(sr);
125
126 end:
127 eina_shutdown();
128
129 return (failed_count == 0) ? 0 : 255;
130}
diff --git a/legacy/elm_code/src/tests/elm_code_suite.h b/legacy/elm_code/src/tests/elm_code_suite.h
deleted file mode 100644
index 750bfd7..0000000
--- a/legacy/elm_code/src/tests/elm_code_suite.h
+++ /dev/null
@@ -1,31 +0,0 @@
1#ifndef _ELM_CODE_SUITE_H
2#define _ELM_CODE_SUITE_H
3
4#include <check.h>
5
6#define ck_assert_strn_eq(s1, s2, len) \
7 { \
8 char expected[len+1], actual[len+1]; \
9\
10 strncpy(expected, s1, len); \
11 expected[len] = '\0'; \
12 strncpy(actual, s2, len); \
13 actual[len] = '\0'; \
14\
15 ck_assert_str_eq(expected, actual); \
16 }
17
18#include <Elm_Code.h>
19
20void elm_code_file_test_load(TCase *tc);
21void elm_code_file_test_memory(TCase *tc);
22void elm_code_test_basic(TCase *tc);
23void elm_code_test_line(TCase *tc);
24void elm_code_test_parse(TCase *tc);
25void elm_code_test_text(TCase *tc);
26void elm_code_test_widget(TCase *tc);
27void elm_code_test_widget_text(TCase *tc);
28void elm_code_test_widget_selection(TCase *tc);
29void elm_code_test_widget_undo(TCase *tc);
30
31#endif /* _EDLM_CODE_SUITE_H */
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 550a54a..c122a75 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -135,6 +135,7 @@ elm_public_eolian_files = \
135 lib/elementary/elm_progressbar_internal_part.eo \ 135 lib/elementary/elm_progressbar_internal_part.eo \
136 lib/elementary/elm_popup_internal_part.eo \ 136 lib/elementary/elm_popup_internal_part.eo \
137 lib/elementary/elm_scroller_internal_part.eo \ 137 lib/elementary/elm_scroller_internal_part.eo \
138 lib/elementary/elm_code_widget.eo \
138 $(NULL) 139 $(NULL)
139 140
140# Legacy classes - not part of public EO API 141# Legacy classes - not part of public EO API
@@ -252,7 +253,16 @@ includesunstable_HEADERS = \
252 lib/elementary/elm_widget_thumb.h \ 253 lib/elementary/elm_widget_thumb.h \
253 lib/elementary/elm_widget_toolbar.h \ 254 lib/elementary/elm_widget_toolbar.h \
254 lib/elementary/elm_widget_video.h \ 255 lib/elementary/elm_widget_video.h \
255 lib/elementary/elm_widget_web.h 256 lib/elementary/elm_widget_web.h \
257 lib/elementary/elm_code.h \
258 lib/elementary/elm_code_widget_legacy.h \
259 lib/elementary/elm_code_widget_selection.h \
260 lib/elementary/elm_code_diff_widget.h \
261 lib/elementary/elm_code_common.h \
262 lib/elementary/elm_code_line.h \
263 lib/elementary/elm_code_text.h \
264 lib/elementary/elm_code_file.h \
265 lib/elementary/elm_code_parse.h
256includesunstabledir = $(includedir)/elementary-@VMAJ@ 266includesunstabledir = $(includedir)/elementary-@VMAJ@
257 267
258nodist_includesunstable_HEADERS = \ 268nodist_includesunstable_HEADERS = \
@@ -562,6 +572,16 @@ lib_elementary_libelementary_la_SOURCES = \
562 lib/elementary/elm_check.c \ 572 lib/elementary/elm_check.c \
563 lib/elementary/elm_clock.c \ 573 lib/elementary/elm_clock.c \
564 lib/elementary/elm_cnp.c \ 574 lib/elementary/elm_cnp.c \
575 lib/elementary/elm_code_line.c \
576 lib/elementary/elm_code_text.c \
577 lib/elementary/elm_code_file.c \
578 lib/elementary/elm_code_parse.c \
579 lib/elementary/elm_code_widget_selection.c \
580 lib/elementary/elm_code_widget.c \
581 lib/elementary/elm_code_diff_widget.c \
582 lib/elementary/elm_code.c \
583 lib/elementary/elm_code_private.h \
584 lib/elementary/elm_code_widget_private.h \
565 lib/elementary/elm_colorselector.c \ 585 lib/elementary/elm_colorselector.c \
566 lib/elementary/elm_color_class.c \ 586 lib/elementary/elm_color_class.c \
567 lib/elementary/elc_combobox.c \ 587 lib/elementary/elc_combobox.c \
@@ -1214,6 +1234,11 @@ edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1214edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static 1234edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
1215 1235
1216### Tests 1236### Tests
1237EXTRA_DIST += \
1238tests/elementary/testfile.txt \
1239tests/elementary/testfile-windows.txt \
1240tests/elementary/testfile-withblanks.txt \
1241tests/elementary/testdiff.diff
1217 1242
1218if EFL_ENABLE_TESTS 1243if EFL_ENABLE_TESTS
1219 1244
@@ -1291,12 +1316,24 @@ tests_elementary_elm_suite_SOURCES = \
1291 tests/elementary/elm_test_panes.c \ 1316 tests/elementary/elm_test_panes.c \
1292 tests/elementary/elm_test_slideshow.c \ 1317 tests/elementary/elm_test_slideshow.c \
1293 tests/elementary/elm_test_spinner.c \ 1318 tests/elementary/elm_test_spinner.c \
1294 tests/elementary/elm_test_plug.c 1319 tests/elementary/elm_test_plug.c \
1320 tests/elementary/elm_code_file_test_load.c \
1321 tests/elementary/elm_code_file_test_memory.c \
1322 tests/elementary/elm_code_test_basic.c \
1323 tests/elementary/elm_code_test_line.c \
1324 tests/elementary/elm_code_test_parse.c \
1325 tests/elementary/elm_code_test_text.c \
1326 tests/elementary/elm_code_test_widget.c \
1327 tests/elementary/elm_code_test_widget_text.c \
1328 tests/elementary/elm_code_test_widget_selection.c \
1329 tests/elementary/elm_code_test_widget_undo.c
1295 1330
1296tests_elementary_elm_suite_CPPFLAGS = \ 1331tests_elementary_elm_suite_CPPFLAGS = \
1297 -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \ 1332 -DTESTS_BUILD_DIR=\"${top_builddir}/src/tests/elementary\" \
1333 -DTESTS_SRC_DIR=\"${top_srcdir}/src/tests/elementary\" \
1298 -DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \ 1334 -DELM_IMAGE_DATA_DIR=\"${top_srcdir}/data/elementary\" \
1299 -DELM_TEST_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \ 1335 -DELM_TEST_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
1336 -DPACKAGE_DATA_DIR=\"${abs_top_builddir}/data/elementary\" \
1300 -I$(top_srcdir)/src/lib/elementary \ 1337 -I$(top_srcdir)/src/lib/elementary \
1301 -I$(top_builddir)/src/lib/elementary \ 1338 -I$(top_builddir)/src/lib/elementary \
1302 @CHECK_CFLAGS@ \ 1339 @CHECK_CFLAGS@ \
@@ -1339,4 +1376,7 @@ tests/elementary/elm_suite.h \
1339tests/elementary/elm_test_helper.h \ 1376tests/elementary/elm_test_helper.h \
1340lib/elementary/Makefile.am \ 1377lib/elementary/Makefile.am \
1341lib/elementary/Makefile.in \ 1378lib/elementary/Makefile.in \
1342lib/elementary/Elementary.h.in 1379lib/elementary/Elementary.h.in \
1380lib/elementary/elm_code_widget_text.c \
1381lib/elementary/elm_code_widget_undo.c
1382
diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in
index b85eaff..59d4081 100644
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -202,6 +202,7 @@ EAPI extern Elm_Version *elm_version;
202#include <elm_check.h> 202#include <elm_check.h>
203#include <elm_clock.h> 203#include <elm_clock.h>
204#include <elm_cnp.h> 204#include <elm_cnp.h>
205#include <elm_code.h>
205#include <elm_colorselector.h> 206#include <elm_colorselector.h>
206#include <elm_color_class.h> 207#include <elm_color_class.h>
207#include <elm_conform.h> 208#include <elm_conform.h>
diff --git a/legacy/elm_code/src/lib/elm_code.c b/src/lib/elementary/elm_code.c
index 598f928..ff26ea0 100644
--- a/legacy/elm_code/src/lib/elm_code.c
+++ b/src/lib/elementary/elm_code.c
@@ -1,11 +1,11 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include <Eo.h> 5#include <Eo.h>
6#include <Evas.h> 6#include <Evas.h>
7 7
8#include "Elm_Code.h" 8#include "Elementary.h"
9 9
10#include "elm_code_private.h" 10#include "elm_code_private.h"
11 11
diff --git a/legacy/elm_code/src/lib/Elm_Code.h b/src/lib/elementary/elm_code.h
index 9d14b40..046cb6e 100644
--- a/legacy/elm_code/src/lib/Elm_Code.h
+++ b/src/lib/elementary/elm_code.h
@@ -1,46 +1,14 @@
1#ifndef ELM_CODE_H_ 1#ifndef ELM_CODE_H_
2# define ELM_CODE_H_ 2# define ELM_CODE_H_
3 3
4#include <Eina.h>
5#include <Eo.h>
6#include <Elementary.h>
7#define ELM_INTERNAL_API_ARGESFSDFEFC
8#include <elm_widget.h>
9
10#ifdef EAPI
11# undef EAPI
12#endif
13
14#ifdef _WIN32
15# ifdef EFL_ELM_CODE_BUILD
16# ifdef DLL_EXPORT
17# define EAPI __declspec(dllexport)
18# else
19# define EAPI
20# endif /* ! DLL_EXPORT */
21# else
22# define EAPI __declspec(dllimport)
23# endif /* ! EFL_ELM_CODE_BUILD */
24#else
25# ifdef __GNUC__
26# if __GNUC__ >= 4
27# define EAPI __attribute__ ((visibility("default")))
28# else
29# define EAPI
30# endif
31# else
32# define EAPI
33# endif
34#endif /* ! _WIN32 */
35
36#include "elm_code_common.h" 4#include "elm_code_common.h"
37#include "elm_code_line.h" 5#include "elm_code_line.h"
38#include "elm_code_text.h" 6#include "elm_code_text.h"
39#include "elm_code_file.h" 7#include "elm_code_file.h"
40#include "elm_code_parse.h" 8#include "elm_code_parse.h"
41#include "widget/elm_code_widget.eo.h" 9#include "elm_code_widget.eo.h"
42#include "widget/elm_code_widget_legacy.h" 10#include "elm_code_widget_legacy.h"
43#include "widget/elm_code_widget_selection.h" 11#include "elm_code_widget_selection.h"
44#include "elm_code_diff_widget.h" 12#include "elm_code_diff_widget.h"
45 13
46#ifdef __cplusplus 14#ifdef __cplusplus
diff --git a/legacy/elm_code/src/lib/elm_code_common.h b/src/lib/elementary/elm_code_common.h
index 163bbae..163bbae 100644
--- a/legacy/elm_code/src/lib/elm_code_common.h
+++ b/src/lib/elementary/elm_code_common.h
diff --git a/legacy/elm_code/src/lib/elm_code_diff_widget.c b/src/lib/elementary/elm_code_diff_widget.c
index 7efb848..c874805 100644
--- a/legacy/elm_code/src/lib/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/elm_code_diff_widget.h b/src/lib/elementary/elm_code_diff_widget.h
index 7a6f2d6..7a6f2d6 100644
--- a/legacy/elm_code/src/lib/elm_code_diff_widget.h
+++ b/src/lib/elementary/elm_code_diff_widget.h
diff --git a/legacy/elm_code/src/lib/elm_code_file.c b/src/lib/elementary/elm_code_file.c
index 5db1bfa..4e8dee4 100644
--- a/legacy/elm_code/src/lib/elm_code_file.c
+++ b/src/lib/elementary/elm_code_file.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8 8
@@ -319,4 +319,3 @@ EAPI Elm_Code_Line *elm_code_file_line_get(Elm_Code_File *file, unsigned int num
319{ 319{
320 return eina_list_nth(file->lines, number - 1); 320 return eina_list_nth(file->lines, number - 1);
321} 321}
322
diff --git a/legacy/elm_code/src/lib/elm_code_file.h b/src/lib/elementary/elm_code_file.h
index 3c3d4bd..3c3d4bd 100644
--- a/legacy/elm_code/src/lib/elm_code_file.h
+++ b/src/lib/elementary/elm_code_file.h
diff --git a/legacy/elm_code/src/lib/elm_code_line.c b/src/lib/elementary/elm_code_line.c
index b2ee714..2b3281d 100644
--- a/legacy/elm_code/src/lib/elm_code_line.c
+++ b/src/lib/elementary/elm_code_line.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/elm_code_line.h b/src/lib/elementary/elm_code_line.h
index 8819689..8819689 100644
--- a/legacy/elm_code/src/lib/elm_code_line.h
+++ b/src/lib/elementary/elm_code_line.h
diff --git a/legacy/elm_code/src/lib/elm_code_parse.c b/src/lib/elementary/elm_code_parse.c
index f7fd97e..5869f8c 100644
--- a/legacy/elm_code/src/lib/elm_code_parse.c
+++ b/src/lib/elementary/elm_code_parse.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/elm_code_parse.h b/src/lib/elementary/elm_code_parse.h
index bc674f8..bc674f8 100644
--- a/legacy/elm_code/src/lib/elm_code_parse.h
+++ b/src/lib/elementary/elm_code_parse.h
diff --git a/legacy/elm_code/src/lib/elm_code_private.h b/src/lib/elementary/elm_code_private.h
index 39f89bd..39f89bd 100644
--- a/legacy/elm_code/src/lib/elm_code_private.h
+++ b/src/lib/elementary/elm_code_private.h
diff --git a/legacy/elm_code/src/lib/elm_code_text.c b/src/lib/elementary/elm_code_text.c
index 901b6ae..f1503e7 100644
--- a/legacy/elm_code/src/lib/elm_code_text.c
+++ b/src/lib/elementary/elm_code_text.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_private.h" 7#include "elm_code_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/elm_code_text.h b/src/lib/elementary/elm_code_text.h
index 54b64d1..54b64d1 100644
--- a/legacy/elm_code/src/lib/elm_code_text.h
+++ b/src/lib/elementary/elm_code_text.h
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 9af37bd..9a9418e 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1,8 +1,11 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include <Elementary.h>
6
7#include "elm_priv.h"
8
6#include "elm_code_private.h" 9#include "elm_code_private.h"
7#include "elm_code_widget_private.h" 10#include "elm_code_widget_private.h"
8 11
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 65dd56a..2a977ab 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -1,6 +1,7 @@
1import evas_types; 1import evas_types;
2import edje_types; 2import edje_types;
3import elm_interface_scrollable; 3import elm_interface_scrollable;
4import elm_general;
4 5
5struct @extern Elm_Code; /* The main interface currently defined in code */ 6struct @extern Elm_Code; /* The main interface currently defined in code */
6struct @extern Elm_Code_Line; /* Parts of the interface currently defined in code */ 7struct @extern Elm_Code_Line; /* Parts of the interface currently defined in code */
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_legacy.h b/src/lib/elementary/elm_code_widget_legacy.h
index 450f4ad..5110e30 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_legacy.h
+++ b/src/lib/elementary/elm_code_widget_legacy.h
@@ -10,4 +10,4 @@
10 */ 10 */
11EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code); 11EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code);
12 12
13#include "widget/elm_code_widget.eo.legacy.h" 13#include "elm_code_widget.eo.legacy.h"
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_private.h b/src/lib/elementary/elm_code_widget_private.h
index 09c5003..09c5003 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_private.h
+++ b/src/lib/elementary/elm_code_widget_private.h
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_selection.c b/src/lib/elementary/elm_code_widget_selection.c
index 9e82ac5..33da3aa 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_widget_private.h" 7#include "elm_code_widget_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_selection.h b/src/lib/elementary/elm_code_widget_selection.h
index b79abc7..b79abc7 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_selection.h
+++ b/src/lib/elementary/elm_code_widget_selection.h
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_text.c b/src/lib/elementary/elm_code_widget_text.c
index 3689e82..bbcbdc3 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_text.c
+++ b/src/lib/elementary/elm_code_widget_text.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_widget_private.h" 7#include "elm_code_widget_private.h"
8 8
diff --git a/legacy/elm_code/src/lib/widget/elm_code_widget_undo.c b/src/lib/elementary/elm_code_widget_undo.c
index 1eaceaa..ccf621b 100644
--- a/legacy/elm_code/src/lib/widget/elm_code_widget_undo.c
+++ b/src/lib/elementary/elm_code_widget_undo.c
@@ -1,8 +1,8 @@
1#ifdef HAVE_CONFIG 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "Elm_Code.h" 5#include "Elementary.h"
6 6
7#include "elm_code_widget_private.h" 7#include "elm_code_widget_private.h"
8 8
diff --git a/legacy/elm_code/src/tests/elm_code_file_test_load.c b/src/tests/elementary/elm_code_file_test_load.c
index 02a6f7e..7e21b23 100644
--- a/legacy/elm_code/src/tests/elm_code_file_test_load.c
+++ b/src/tests/elementary/elm_code_file_test_load.c
@@ -1,16 +1,20 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6 9
7START_TEST (elm_code_file_load) 10START_TEST (elm_code_file_load)
8{ 11{
9 char *path = TESTS_DIR "testfile.txt"; 12 char *path = TESTS_SRC_DIR "/testfile.txt";
10 char real[EINA_PATH_MAX]; 13 char real[EINA_PATH_MAX];
11 Elm_Code_File *file; 14 Elm_Code_File *file;
12 Elm_Code *code; 15 Elm_Code *code;
13 16
17 elm_init(1, NULL);
14 code = elm_code_create(); 18 code = elm_code_create();
15 file = elm_code_file_open(code, path); 19 file = elm_code_file_open(code, path);
16 realpath(path, real); 20 realpath(path, real);
@@ -19,51 +23,58 @@ START_TEST (elm_code_file_load)
19 ck_assert_str_eq(real, elm_code_file_path_get(file)); 23 ck_assert_str_eq(real, elm_code_file_path_get(file));
20 elm_code_file_close(file); 24 elm_code_file_close(file);
21 elm_code_free(code); 25 elm_code_free(code);
26 elm_shutdown();
22} 27}
23END_TEST 28END_TEST
24 29
25START_TEST (elm_code_file_load_lines) 30START_TEST (elm_code_file_load_lines)
26{ 31{
27 char *path = TESTS_DIR "testfile.txt"; 32 char *path = TESTS_SRC_DIR "/testfile.txt";
28 Elm_Code_File *file; 33 Elm_Code_File *file;
29 Elm_Code *code; 34 Elm_Code *code;
30 35
36 elm_init(1, NULL);
31 code = elm_code_create(); 37 code = elm_code_create();
32 file = elm_code_file_open(code, path); 38 file = elm_code_file_open(code, path);
33 39
34 ck_assert_uint_eq(4, elm_code_file_lines_get(file)); 40 ck_assert_uint_eq(4, elm_code_file_lines_get(file));
35 elm_code_file_close(file); 41 elm_code_file_close(file);
36 elm_code_free(code); 42 elm_code_free(code);
43 elm_shutdown();
37} 44}
38END_TEST 45END_TEST
39 46
40START_TEST (elm_code_file_load_blank_lines) 47START_TEST (elm_code_file_load_blank_lines)
41{ 48{
42 char *path = TESTS_DIR "testfile-withblanks.txt"; 49 char *path = TESTS_SRC_DIR "/testfile-withblanks.txt";
43 Elm_Code_File *file; 50 Elm_Code_File *file;
44 Elm_Code *code; 51 Elm_Code *code;
45 52
53 elm_init(1, NULL);
46 code = elm_code_create(); 54 code = elm_code_create();
47 file = elm_code_file_open(code, path); 55 file = elm_code_file_open(code, path);
48 56
49 ck_assert_uint_eq(8, elm_code_file_lines_get(file)); 57 ck_assert_uint_eq(8, elm_code_file_lines_get(file));
50 elm_code_file_close(file); 58 elm_code_file_close(file);
51 elm_code_free(code); 59 elm_code_free(code);
60 elm_shutdown();
52} 61}
53END_TEST 62END_TEST
54 63
55START_TEST (elm_code_file_load_windows) 64START_TEST (elm_code_file_load_windows)
56{ 65{
57 char *path = TESTS_DIR "testfile-windows.txt"; 66 char *path = TESTS_SRC_DIR "/testfile-windows.txt";
58 Elm_Code_File *file; 67 Elm_Code_File *file;
59 Elm_Code *code; 68 Elm_Code *code;
60 69
70 elm_init(1, NULL);
61 code = elm_code_create(); 71 code = elm_code_create();
62 file = elm_code_file_open(code, path); 72 file = elm_code_file_open(code, path);
63 73
64 ck_assert_uint_eq(4, elm_code_file_lines_get(file)); 74 ck_assert_uint_eq(4, elm_code_file_lines_get(file));
65 elm_code_file_close(file); 75 elm_code_file_close(file);
66 elm_code_free(code); 76 elm_code_free(code);
77 elm_shutdown();
67} 78}
68END_TEST 79END_TEST
69 80
@@ -81,10 +92,11 @@ static void _assert_line_content_eq(const char *content, Elm_Code_Line *line)
81 92
82START_TEST (elm_code_file_load_content) 93START_TEST (elm_code_file_load_content)
83{ 94{
84 char *path = TESTS_DIR "testfile.txt"; 95 char *path = TESTS_SRC_DIR "/testfile.txt";
85 Elm_Code_File *file; 96 Elm_Code_File *file;
86 Elm_Code *code; 97 Elm_Code *code;
87 98
99 elm_init(1, NULL);
88 code = elm_code_create(); 100 code = elm_code_create();
89 file = elm_code_file_open(code, path); 101 file = elm_code_file_open(code, path);
90 102
@@ -92,16 +104,18 @@ START_TEST (elm_code_file_load_content)
92 _assert_line_content_eq("another line", elm_code_file_line_get(file, 4)); 104 _assert_line_content_eq("another line", elm_code_file_line_get(file, 4));
93 elm_code_file_close(file); 105 elm_code_file_close(file);
94 elm_code_free(code); 106 elm_code_free(code);
107 elm_shutdown();
95} 108}
96END_TEST 109END_TEST
97 110
98START_TEST (elm_code_file_line_ending_unix) 111START_TEST (elm_code_file_line_ending_unix)
99{ 112{
100 char *path = TESTS_DIR "testfile.txt"; 113 char *path = TESTS_SRC_DIR "/testfile.txt";
101 Elm_Code_File *file; 114 Elm_Code_File *file;
102 Elm_Code *code; 115 Elm_Code *code;
103 short len; 116 short len;
104 117
118 elm_init(1, NULL);
105 code = elm_code_create(); 119 code = elm_code_create();
106 file = elm_code_file_open(code, path); 120 file = elm_code_file_open(code, path);
107 121
@@ -111,16 +125,18 @@ START_TEST (elm_code_file_line_ending_unix)
111 125
112 elm_code_file_close(file); 126 elm_code_file_close(file);
113 elm_code_free(code); 127 elm_code_free(code);
128 elm_shutdown();
114} 129}
115END_TEST 130END_TEST
116 131
117START_TEST (elm_code_file_line_ending_windows) 132START_TEST (elm_code_file_line_ending_windows)
118{ 133{
119 char *path = TESTS_DIR "testfile-windows.txt"; 134 char *path = TESTS_SRC_DIR "/testfile-windows.txt";
120 Elm_Code_File *file; 135 Elm_Code_File *file;
121 Elm_Code *code; 136 Elm_Code *code;
122 short len; 137 short len;
123 138
139 elm_init(1, NULL);
124 code = elm_code_create(); 140 code = elm_code_create();
125 file = elm_code_file_open(code, path); 141 file = elm_code_file_open(code, path);
126 142
@@ -130,6 +146,7 @@ START_TEST (elm_code_file_line_ending_windows)
130 146
131 elm_code_file_close(file); 147 elm_code_file_close(file);
132 elm_code_free(code); 148 elm_code_free(code);
149 elm_shutdown();
133} 150}
134END_TEST 151END_TEST
135 152
@@ -143,4 +160,3 @@ void elm_code_file_test_load(TCase *tc)
143 tcase_add_test(tc, elm_code_file_line_ending_unix); 160 tcase_add_test(tc, elm_code_file_line_ending_unix);
144 tcase_add_test(tc, elm_code_file_line_ending_windows); 161 tcase_add_test(tc, elm_code_file_line_ending_windows);
145} 162}
146
diff --git a/legacy/elm_code/src/tests/elm_code_file_test_memory.c b/src/tests/elementary/elm_code_file_test_memory.c
index b82ce2e..f39228d 100644
--- a/legacy/elm_code/src/tests/elm_code_file_test_memory.c
+++ b/src/tests/elementary/elm_code_file_test_memory.c
@@ -1,13 +1,17 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6 9
7START_TEST (elm_code_file_memory_lines) 10START_TEST (elm_code_file_memory_lines)
8{ 11{
9 Elm_Code *code; 12 Elm_Code *code;
10 13
14 elm_init(1, NULL);
11 code = elm_code_create(); 15 code = elm_code_create();
12 ck_assert_uint_eq(0, elm_code_file_lines_get(code->file)); 16 ck_assert_uint_eq(0, elm_code_file_lines_get(code->file));
13 17
@@ -15,6 +19,7 @@ START_TEST (elm_code_file_memory_lines)
15 19
16 ck_assert_uint_eq(1, elm_code_file_lines_get(code->file)); 20 ck_assert_uint_eq(1, elm_code_file_lines_get(code->file));
17 elm_code_free(code); 21 elm_code_free(code);
22 elm_shutdown();
18} 23}
19END_TEST 24END_TEST
20 25
@@ -24,6 +29,7 @@ START_TEST (elm_code_file_memory_tokens)
24 Elm_Code_Line *line; 29 Elm_Code_Line *line;
25 Elm_Code *code; 30 Elm_Code *code;
26 31
32 elm_init(1, NULL);
27 code = elm_code_create(); 33 code = elm_code_create();
28 file = code->file; 34 file = code->file;
29 elm_code_file_line_append(file, "a line", 6, NULL); 35 elm_code_file_line_append(file, "a line", 6, NULL);
@@ -32,6 +38,7 @@ START_TEST (elm_code_file_memory_tokens)
32 elm_code_line_token_add(line, 2, 5, 1, ELM_CODE_TOKEN_TYPE_COMMENT); 38 elm_code_line_token_add(line, 2, 5, 1, ELM_CODE_TOKEN_TYPE_COMMENT);
33 ck_assert_uint_eq(1, eina_list_count(line->tokens)); 39 ck_assert_uint_eq(1, eina_list_count(line->tokens));
34 elm_code_free(code); 40 elm_code_free(code);
41 elm_shutdown();
35} 42}
36END_TEST 43END_TEST
37 44
@@ -40,4 +47,3 @@ void elm_code_file_test_memory(TCase *tc)
40 tcase_add_test(tc, elm_code_file_memory_lines); 47 tcase_add_test(tc, elm_code_file_memory_lines);
41 tcase_add_test(tc, elm_code_file_memory_tokens); 48 tcase_add_test(tc, elm_code_file_memory_tokens);
42} 49}
43
diff --git a/legacy/elm_code/src/tests/elm_code_test_basic.c b/src/tests/elementary/elm_code_test_basic.c
index b968e90..9805a75 100644
--- a/legacy/elm_code/src/tests/elm_code_test_basic.c
+++ b/src/tests/elementary/elm_code_test_basic.c
@@ -1,19 +1,24 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6 9
7START_TEST (elm_code_create_test) 10START_TEST (elm_code_create_test)
8{ 11{
9 char *path = "elm_code/src/tests/testfile.txt"; 12 char *path = TESTS_SRC_DIR "/testfile.txt";
10 Elm_Code *code; 13 Elm_Code *code;
11 14
15 elm_init(1, NULL);
12 code = elm_code_create(); 16 code = elm_code_create();
13 elm_code_file_open(code, path); 17 elm_code_file_open(code, path);
14 18
15 ck_assert(!!code); 19 ck_assert(!!code);
16 elm_code_free(code); 20 elm_code_free(code);
21 elm_shutdown();
17} 22}
18END_TEST 23END_TEST
19 24
@@ -21,4 +26,3 @@ void elm_code_test_basic(TCase *tc)
21{ 26{
22 tcase_add_test(tc, elm_code_create_test); 27 tcase_add_test(tc, elm_code_create_test);
23} 28}
24
diff --git a/legacy/elm_code/src/tests/elm_code_test_line.c b/src/tests/elementary/elm_code_test_line.c
index b19bf61..cdbc628 100644
--- a/legacy/elm_code/src/tests/elm_code_test_line.c
+++ b/src/tests/elementary/elm_code_test_line.c
@@ -1,8 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6 9
7START_TEST (elm_code_line_create_test) 10START_TEST (elm_code_line_create_test)
8{ 11{
@@ -10,6 +13,7 @@ START_TEST (elm_code_line_create_test)
10 Elm_Code_File *file; 13 Elm_Code_File *file;
11 Elm_Code_Line *line; 14 Elm_Code_Line *line;
12 15
16 elm_init(1, NULL);
13 code = elm_code_create(); 17 code = elm_code_create();
14 file = elm_code_file_new(code); 18 file = elm_code_file_new(code);
15 19
@@ -19,6 +23,7 @@ START_TEST (elm_code_line_create_test)
19 ck_assert(!!line); 23 ck_assert(!!line);
20 24
21 elm_code_free(code); 25 elm_code_free(code);
26 elm_shutdown();
22} 27}
23END_TEST 28END_TEST
24 29
@@ -28,6 +33,7 @@ START_TEST (elm_code_line_token_count_test)
28 Elm_Code_File *file; 33 Elm_Code_File *file;
29 Elm_Code_Line *line; 34 Elm_Code_Line *line;
30 35
36 elm_init(1, NULL);
31 code = elm_code_create(); 37 code = elm_code_create();
32 file = elm_code_file_new(code); 38 file = elm_code_file_new(code);
33 39
@@ -41,6 +47,7 @@ START_TEST (elm_code_line_token_count_test)
41 ck_assert_int_eq(0, eina_list_count(line->tokens)); 47 ck_assert_int_eq(0, eina_list_count(line->tokens));
42 48
43 elm_code_free(code); 49 elm_code_free(code);
50 elm_shutdown();
44} 51}
45END_TEST 52END_TEST
46 53
@@ -50,6 +57,7 @@ START_TEST (elm_code_line_split_test)
50 Elm_Code_File *file; 57 Elm_Code_File *file;
51 Elm_Code_Line *line, *newline; 58 Elm_Code_Line *line, *newline;
52 59
60 elm_init(1, NULL);
53 code = elm_code_create(); 61 code = elm_code_create();
54 file = elm_code_file_new(code); 62 file = elm_code_file_new(code);
55 63
@@ -63,6 +71,7 @@ START_TEST (elm_code_line_split_test)
63 newline = elm_code_file_line_get(file, 2); 71 newline = elm_code_file_line_get(file, 2);
64 ck_assert_int_eq(5, line->length); 72 ck_assert_int_eq(5, line->length);
65 ck_assert_int_eq(5, newline->length); 73 ck_assert_int_eq(5, newline->length);
74 elm_shutdown();
66} 75}
67END_TEST 76END_TEST
68 77
@@ -72,4 +81,3 @@ void elm_code_test_line(TCase *tc)
72 tcase_add_test(tc, elm_code_line_token_count_test); 81 tcase_add_test(tc, elm_code_line_token_count_test);
73 tcase_add_test(tc, elm_code_line_split_test); 82 tcase_add_test(tc, elm_code_line_split_test);
74} 83}
75
diff --git a/legacy/elm_code/src/tests/elm_code_test_parse.c b/src/tests/elementary/elm_code_test_parse.c
index e91845c..4bd35b4 100644
--- a/legacy/elm_code/src/tests/elm_code_test_parse.c
+++ b/src/tests/elementary/elm_code_test_parse.c
@@ -1,8 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6#include "elm_code_parse.h" 9#include "elm_code_parse.h"
7 10
8static int line_calls, file_calls; 11static int line_calls, file_calls;
@@ -25,6 +28,7 @@ START_TEST (elm_code_parse_hook_memory_test)
25 line_calls = 0; 28 line_calls = 0;
26 file_calls = 0; 29 file_calls = 0;
27 30
31 elm_init(1, NULL);
28 code = elm_code_create(); 32 code = elm_code_create();
29 file = elm_code_file_new(code); 33 file = elm_code_file_new(code);
30 34
@@ -35,6 +39,7 @@ START_TEST (elm_code_parse_hook_memory_test)
35 ck_assert_int_eq(0, file_calls); 39 ck_assert_int_eq(0, file_calls);
36 40
37 elm_code_free(code); 41 elm_code_free(code);
42 elm_shutdown();
38} 43}
39END_TEST 44END_TEST
40 45
@@ -42,11 +47,12 @@ START_TEST (elm_code_parse_hook_file_test)
42{ 47{
43 Elm_Code *code; 48 Elm_Code *code;
44 Elm_Code_File *file; 49 Elm_Code_File *file;
45 char *path = TESTS_DIR "testfile.txt"; 50 char *path = TESTS_SRC_DIR "testfile.txt";
46 51
47 line_calls = 0; 52 line_calls = 0;
48 file_calls = 0; 53 file_calls = 0;
49 54
55 elm_init(1, NULL);
50 code = elm_code_create(); 56 code = elm_code_create();
51 57
52 elm_code_parser_add(code, _parser_line_callback, _parser_file_callback, NULL); 58 elm_code_parser_add(code, _parser_line_callback, _parser_file_callback, NULL);
@@ -57,6 +63,7 @@ START_TEST (elm_code_parse_hook_file_test)
57 63
58 elm_code_file_close(file); 64 elm_code_file_close(file);
59 elm_code_free(code); 65 elm_code_free(code);
66 elm_shutdown();
60} 67}
61END_TEST 68END_TEST
62 69
@@ -66,6 +73,7 @@ START_TEST (elm_code_parse_todo_test)
66 Elm_Code_File *file; 73 Elm_Code_File *file;
67 Elm_Code_Line *line; 74 Elm_Code_Line *line;
68 75
76 elm_init(1, NULL);
69 elm_code_init(); 77 elm_code_init();
70 78
71 code = elm_code_create(); 79 code = elm_code_create();
@@ -82,6 +90,7 @@ START_TEST (elm_code_parse_todo_test)
82 elm_code_line_text_set(line, "TOFIX", 5); 90 elm_code_line_text_set(line, "TOFIX", 5);
83 ck_assert_int_eq(ELM_CODE_STATUS_TYPE_DEFAULT, line->status); 91 ck_assert_int_eq(ELM_CODE_STATUS_TYPE_DEFAULT, line->status);
84 elm_code_shutdown(); 92 elm_code_shutdown();
93 elm_shutdown();
85} 94}
86END_TEST 95END_TEST
87 96
@@ -91,4 +100,3 @@ void elm_code_test_parse(TCase *tc)
91 tcase_add_test(tc, elm_code_parse_hook_file_test); 100 tcase_add_test(tc, elm_code_parse_hook_file_test);
92 tcase_add_test(tc, elm_code_parse_todo_test); 101 tcase_add_test(tc, elm_code_parse_todo_test);
93} 102}
94
diff --git a/legacy/elm_code/src/tests/elm_code_test_text.c b/src/tests/elementary/elm_code_test_text.c
index 26e1aa1..934b98b 100644
--- a/legacy/elm_code/src/tests/elm_code_test_text.c
+++ b/src/tests/elementary/elm_code_test_text.c
@@ -1,8 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6#include "elm_code_text.h" 9#include "elm_code_text.h"
7 10
8START_TEST (elm_code_text_get_test) 11START_TEST (elm_code_text_get_test)
@@ -11,12 +14,14 @@ START_TEST (elm_code_text_get_test)
11 Elm_Code_File *file; 14 Elm_Code_File *file;
12 Elm_Code_Line *line; 15 Elm_Code_Line *line;
13 16
17 elm_init(1, NULL);
14 code = elm_code_create(); 18 code = elm_code_create();
15 file = elm_code_file_new(code); 19 file = elm_code_file_new(code);
16 20
17 elm_code_file_line_append(file, "test", 4, NULL); 21 elm_code_file_line_append(file, "test", 4, NULL);
18 line = elm_code_file_line_get(file, 1); 22 line = elm_code_file_line_get(file, 1);
19 ck_assert_str_eq("test", elm_code_line_text_get(line, NULL)); 23 ck_assert_str_eq("test", elm_code_line_text_get(line, NULL));
24 elm_shutdown();
20} 25}
21END_TEST 26END_TEST
22 27
@@ -26,6 +31,7 @@ START_TEST (elm_code_text_insert_test)
26 Elm_Code_File *file; 31 Elm_Code_File *file;
27 Elm_Code_Line *line; 32 Elm_Code_Line *line;
28 33
34 elm_init(1, NULL);
29 code = elm_code_create(); 35 code = elm_code_create();
30 file = elm_code_file_new(code); 36 file = elm_code_file_new(code);
31 37
@@ -34,6 +40,7 @@ START_TEST (elm_code_text_insert_test)
34 40
35 elm_code_line_text_insert(line, 4, "ing", 3); 41 elm_code_line_text_insert(line, 4, "ing", 3);
36 ck_assert_str_eq("testing", elm_code_line_text_get(line, NULL)); 42 ck_assert_str_eq("testing", elm_code_line_text_get(line, NULL));
43 elm_shutdown();
37} 44}
38END_TEST 45END_TEST
39 46
@@ -43,6 +50,7 @@ START_TEST (elm_code_text_contains_test)
43 Elm_Code_File *file; 50 Elm_Code_File *file;
44 Elm_Code_Line *line; 51 Elm_Code_Line *line;
45 52
53 elm_init(1, NULL);
46 code = elm_code_create(); 54 code = elm_code_create();
47 file = elm_code_file_new(code); 55 file = elm_code_file_new(code);
48 56
@@ -54,6 +62,7 @@ START_TEST (elm_code_text_contains_test)
54 62
55 ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "a t")); 63 ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "a t"));
56 ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "...")); 64 ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "..."));
65 elm_shutdown();
57} 66}
58END_TEST 67END_TEST
59 68
@@ -63,6 +72,7 @@ START_TEST (elm_code_text_strpos_test)
63 Elm_Code_File *file; 72 Elm_Code_File *file;
64 Elm_Code_Line *line; 73 Elm_Code_Line *line;
65 74
75 elm_init(1, NULL);
66 code = elm_code_create(); 76 code = elm_code_create();
67 file = elm_code_file_new(code); 77 file = elm_code_file_new(code);
68 78
@@ -78,6 +88,7 @@ START_TEST (elm_code_text_strpos_test)
78 ck_assert_int_eq(0, elm_code_line_text_strpos(line, "a t", 0)); 88 ck_assert_int_eq(0, elm_code_line_text_strpos(line, "a t", 0));
79 ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "a t", 2)); 89 ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "a t", 2));
80 ck_assert_int_eq(13, elm_code_line_text_strpos(line, "...", 0)); 90 ck_assert_int_eq(13, elm_code_line_text_strpos(line, "...", 0));
91 elm_shutdown();
81} 92}
82END_TEST 93END_TEST
83 94
@@ -87,10 +98,12 @@ START_TEST (elm_code_text_newline_position_test)
87 const char *unixtext = "a test\nwith newline"; 98 const char *unixtext = "a test\nwith newline";
88 const char *wintext = "a windows\r\nnewline"; 99 const char *wintext = "a windows\r\nnewline";
89 100
101 elm_init(1, NULL);
90 ck_assert_int_eq(6, elm_code_text_newlinenpos(unixtext, strlen(unixtext), &nllen)); 102 ck_assert_int_eq(6, elm_code_text_newlinenpos(unixtext, strlen(unixtext), &nllen));
91 ck_assert_int_eq(1, nllen); 103 ck_assert_int_eq(1, nllen);
92 ck_assert_int_eq(9, elm_code_text_newlinenpos(wintext, strlen(wintext), &nllen)); 104 ck_assert_int_eq(9, elm_code_text_newlinenpos(wintext, strlen(wintext), &nllen));
93 ck_assert_int_eq(2, nllen); 105 ck_assert_int_eq(2, nllen);
106 elm_shutdown();
94} 107}
95END_TEST 108END_TEST
96 109
@@ -98,6 +111,7 @@ START_TEST (elm_code_text_leading_whitespace_test)
98{ 111{
99 const char *text; 112 const char *text;
100 113
114 elm_init(1, NULL);
101 text = "testing"; 115 text = "testing";
102 ck_assert_int_eq(0, elm_code_text_leading_whitespace_length(text, strlen(text))); 116 ck_assert_int_eq(0, elm_code_text_leading_whitespace_length(text, strlen(text)));
103 117
@@ -109,6 +123,7 @@ START_TEST (elm_code_text_leading_whitespace_test)
109 123
110 text = " \t mix"; 124 text = " \t mix";
111 ck_assert_int_eq(3, elm_code_text_leading_whitespace_length(text, strlen(text))); 125 ck_assert_int_eq(3, elm_code_text_leading_whitespace_length(text, strlen(text)));
126 elm_shutdown();
112} 127}
113END_TEST 128END_TEST
114 129
@@ -116,6 +131,7 @@ START_TEST (elm_code_text_trailing_whitespace_test)
116{ 131{
117 const char *text; 132 const char *text;
118 133
134 elm_init(1, NULL);
119 text = "testing"; 135 text = "testing";
120 ck_assert_int_eq(0, elm_code_text_trailing_whitespace_length(text, strlen(text))); 136 ck_assert_int_eq(0, elm_code_text_trailing_whitespace_length(text, strlen(text)));
121 137
@@ -127,6 +143,7 @@ START_TEST (elm_code_text_trailing_whitespace_test)
127 143
128 text = "mix \t "; 144 text = "mix \t ";
129 ck_assert_int_eq(3, elm_code_text_trailing_whitespace_length(text, strlen(text))); 145 ck_assert_int_eq(3, elm_code_text_trailing_whitespace_length(text, strlen(text)));
146 elm_shutdown();
130} 147}
131END_TEST 148END_TEST
132 149
@@ -134,6 +151,7 @@ START_TEST (elm_code_text_is_whitespace_test)
134{ 151{
135 const char *text; 152 const char *text;
136 153
154 elm_init(1, NULL);
137 text = " "; 155 text = " ";
138 ck_assert_int_eq(1, elm_code_text_is_whitespace(text, strlen(text))); 156 ck_assert_int_eq(1, elm_code_text_is_whitespace(text, strlen(text)));
139 157
@@ -142,6 +160,7 @@ START_TEST (elm_code_text_is_whitespace_test)
142 160
143 text = " . "; 161 text = " . ";
144 ck_assert_int_eq(0, elm_code_text_is_whitespace(text, strlen(text))); 162 ck_assert_int_eq(0, elm_code_text_is_whitespace(text, strlen(text)));
163 elm_shutdown();
145} 164}
146END_TEST 165END_TEST
147 166
diff --git a/legacy/elm_code/src/tests/widget/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index 7f2303f..6600153 100644
--- a/legacy/elm_code/src/tests/widget/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -1,10 +1,12 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6 6
7#include "widget/elm_code_widget.c" 7#include "elm_suite.h"
8#include "Elementary.h"
9#include "elm_code_widget.c"
8 10
9static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id) 11static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id)
10{ 12{
@@ -89,4 +91,3 @@ void elm_code_test_widget(TCase *tc)
89 tcase_add_test(tc, elm_code_widget_construct); 91 tcase_add_test(tc, elm_code_widget_construct);
90 tcase_add_test(tc, elm_code_widget_construct_nocode); 92 tcase_add_test(tc, elm_code_widget_construct_nocode);
91} 93}
92
diff --git a/legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c b/src/tests/elementary/elm_code_test_widget_selection.c
index 9769f6b..e181e6e 100644
--- a/legacy/elm_code/src/tests/widget/elm_code_test_widget_selection.c
+++ b/src/tests/elementary/elm_code_test_widget_selection.c
@@ -1,12 +1,13 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6 6
7#include "elm_suite.h"
8#include "Elementary.h"
7#include "elm_code_widget_private.h" 9#include "elm_code_widget_private.h"
8 10#include "elm_code_widget_selection.h"
9#include "widget/elm_code_widget_selection.h"
10 11
11START_TEST (elm_code_test_widget_selection_set) 12START_TEST (elm_code_test_widget_selection_set)
12{ 13{
@@ -502,6 +503,7 @@ START_TEST (elm_code_test_widget_selection_select_line)
502 selection = elm_code_widget_selection_text_get(widget); 503 selection = elm_code_widget_selection_text_get(widget);
503 ck_assert_str_eq("line2", selection); 504 ck_assert_str_eq("line2", selection);
504 free(selection); 505 free(selection);
506 elm_shutdown();
505} 507}
506END_TEST 508END_TEST
507 509
@@ -536,6 +538,7 @@ START_TEST (elm_code_test_widget_selection_select_word)
536 selection = elm_code_widget_selection_text_get(widget); 538 selection = elm_code_widget_selection_text_get(widget);
537 ck_assert_str_eq("stuff", selection); 539 ck_assert_str_eq("stuff", selection);
538 free(selection); 540 free(selection);
541 elm_shutdown();
539} 542}
540END_TEST 543END_TEST
541 544
@@ -574,6 +577,7 @@ START_TEST (elm_code_test_widget_selection_select_word_punctuation)
574 selection = elm_code_widget_selection_text_get(widget); 577 selection = elm_code_widget_selection_text_get(widget);
575 ck_assert_str_eq("mark", selection); 578 ck_assert_str_eq("mark", selection);
576 free(selection); 579 free(selection);
580 elm_shutdown();
577} 581}
578END_TEST 582END_TEST
579 583
@@ -612,6 +616,7 @@ START_TEST (elm_code_test_widget_selection_select_word_symbols)
612 selection = elm_code_widget_selection_text_get(widget); 616 selection = elm_code_widget_selection_text_get(widget);
613 ck_assert_str_eq("braces", selection); 617 ck_assert_str_eq("braces", selection);
614 free(selection); 618 free(selection);
619 elm_shutdown();
615} 620}
616END_TEST 621END_TEST
617 622
@@ -636,4 +641,3 @@ void elm_code_test_widget_selection(TCase *tc)
636 tcase_add_test(tc, elm_code_test_widget_selection_select_word_punctuation); 641 tcase_add_test(tc, elm_code_test_widget_selection_select_word_punctuation);
637 tcase_add_test(tc, elm_code_test_widget_selection_select_word_symbols); 642 tcase_add_test(tc, elm_code_test_widget_selection_select_word_symbols);
638} 643}
639
diff --git a/legacy/elm_code/src/tests/widget/elm_code_test_widget_text.c b/src/tests/elementary/elm_code_test_widget_text.c
index 86d4a33..e11ce6f 100644
--- a/legacy/elm_code/src/tests/widget/elm_code_test_widget_text.c
+++ b/src/tests/elementary/elm_code_test_widget_text.c
@@ -1,8 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6
7#include "elm_suite.h"
8#include "Elementary.h"
6 9
7START_TEST (elm_code_test_widget_text_tab_width) 10START_TEST (elm_code_test_widget_text_tab_width)
8{ 11{
@@ -48,6 +51,7 @@ START_TEST (elm_code_test_widget_text_position)
48 51
49 ck_assert_int_eq(2, elm_code_widget_line_text_position_for_column_get(widget, line, 9)); 52 ck_assert_int_eq(2, elm_code_widget_line_text_position_for_column_get(widget, line, 9));
50 ck_assert_int_eq(1, elm_code_widget_line_text_position_for_column_get(widget, line, 7)); 53 ck_assert_int_eq(1, elm_code_widget_line_text_position_for_column_get(widget, line, 7));
54 elm_shutdown();
51} 55}
52END_TEST 56END_TEST
53 57
@@ -56,4 +60,3 @@ void elm_code_test_widget_text(TCase *tc)
56 tcase_add_test(tc, elm_code_test_widget_text_tab_width); 60 tcase_add_test(tc, elm_code_test_widget_text_tab_width);
57 tcase_add_test(tc, elm_code_test_widget_text_position); 61 tcase_add_test(tc, elm_code_test_widget_text_position);
58} 62}
59
diff --git a/legacy/elm_code/src/tests/widget/elm_code_test_widget_undo.c b/src/tests/elementary/elm_code_test_widget_undo.c
index 0de2cb9..b07a294 100644
--- a/legacy/elm_code/src/tests/widget/elm_code_test_widget_undo.c
+++ b/src/tests/elementary/elm_code_test_widget_undo.c
@@ -1,9 +1,11 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include "config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#include "elm_code_suite.h" 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6 6
7#include "elm_suite.h"
8#include "Elementary.h"
7#include "elm_code_widget_private.h" 9#include "elm_code_widget_private.h"
8 10
9START_TEST (elm_code_test_widget_undo_text_insert) 11START_TEST (elm_code_test_widget_undo_text_insert)
@@ -161,4 +163,3 @@ void elm_code_test_widget_undo(TCase *tc)
161 tcase_add_test(tc, elm_code_test_widget_undo_newline); 163 tcase_add_test(tc, elm_code_test_widget_undo_newline);
162 tcase_add_test(tc, elm_code_test_widget_undo_delete); 164 tcase_add_test(tc, elm_code_test_widget_undo_delete);
163} 165}
164
diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c
index 75facc6..a612e7e 100644
--- a/src/tests/elementary/elm_suite.c
+++ b/src/tests/elementary/elm_suite.c
@@ -71,6 +71,15 @@ static const Efl_Test_Case etc[] = {
71 { "elm_slideshow", elm_test_slideshow}, 71 { "elm_slideshow", elm_test_slideshow},
72 { "elm_spinner", elm_test_spinner}, 72 { "elm_spinner", elm_test_spinner},
73 { "elm_plug", elm_test_plug}, 73 { "elm_plug", elm_test_plug},
74 { "file_load", elm_code_file_test_load },
75 { "file_memory", elm_code_file_test_memory },
76 { "parse", elm_code_test_parse },
77 { "text", elm_code_test_text },
78 { "basic", elm_code_test_basic },
79 { "widget", elm_code_test_widget },
80 { "widget_text", elm_code_test_widget_text },
81 { "widget_selection", elm_code_test_widget_selection },
82 { "widget_undo", elm_code_test_widget_undo },
74 { NULL, NULL } 83 { NULL, NULL }
75}; 84};
76 85
diff --git a/src/tests/elementary/elm_suite.h b/src/tests/elementary/elm_suite.h
index 1a19179..bf87d1b 100644
--- a/src/tests/elementary/elm_suite.h
+++ b/src/tests/elementary/elm_suite.h
@@ -69,4 +69,15 @@ void elm_test_slideshow(TCase *tc);
69void elm_test_spinner(TCase *tc); 69void elm_test_spinner(TCase *tc);
70void elm_test_plug(TCase *tc); 70void elm_test_plug(TCase *tc);
71 71
72void elm_code_file_test_load(TCase *tc);
73void elm_code_file_test_memory(TCase *tc);
74void elm_code_test_basic(TCase *tc);
75void elm_code_test_line(TCase *tc);
76void elm_code_test_parse(TCase *tc);
77void elm_code_test_text(TCase *tc);
78void elm_code_test_widget(TCase *tc);
79void elm_code_test_widget_text(TCase *tc);
80void elm_code_test_widget_selection(TCase *tc);
81void elm_code_test_widget_undo(TCase *tc);
82
72#endif /* _ELM_SUITE_H */ 83#endif /* _ELM_SUITE_H */
diff --git a/src/tests/elementary/elm_test_helper.h b/src/tests/elementary/elm_test_helper.h
index 0bfc5ca..f0b44bb 100644
--- a/src/tests/elementary/elm_test_helper.h
+++ b/src/tests/elementary/elm_test_helper.h
@@ -3,6 +3,19 @@
3 3
4#include <Eina.h> 4#include <Eina.h>
5 5
6#define ck_assert_strn_eq(s1, s2, len) \
7 { \
8 char expected[len+1], actual[len+1]; \
9 \
10 strncpy(expected, s1, len); \
11 expected[len] = '\0'; \
12 strncpy(actual, s2, len); \
13 actual[len] = '\0'; \
14 \
15 ck_assert_str_eq(expected, actual); \
16 }
17
18
6Eina_Bool elm_test_helper_wait_flag(double in, Eina_Bool *done); 19Eina_Bool elm_test_helper_wait_flag(double in, Eina_Bool *done);
7 20
8#endif /* _ELM_TEST_HELPER_H */ 21#endif /* _ELM_TEST_HELPER_H */
diff --git a/legacy/elm_code/src/tests/testdiff.diff b/src/tests/elementary/testdiff.diff
index 157cbb7..157cbb7 100644
--- a/legacy/elm_code/src/tests/testdiff.diff
+++ b/src/tests/elementary/testdiff.diff
diff --git a/legacy/elm_code/src/tests/testfile-windows.txt b/src/tests/elementary/testfile-windows.txt
index c397f82..c397f82 100644
--- a/legacy/elm_code/src/tests/testfile-windows.txt
+++ b/src/tests/elementary/testfile-windows.txt
diff --git a/legacy/elm_code/src/tests/testfile-withblanks.txt b/src/tests/elementary/testfile-withblanks.txt
index 0f2ead3..0f2ead3 100644
--- a/legacy/elm_code/src/tests/testfile-withblanks.txt
+++ b/src/tests/elementary/testfile-withblanks.txt
diff --git a/legacy/elm_code/src/tests/testfile.txt b/src/tests/elementary/testfile.txt
index 8fd6a8b..8fd6a8b 100644
--- a/legacy/elm_code/src/tests/testfile.txt
+++ b/src/tests/elementary/testfile.txt