From d5441af19d95b021e137ca53241e4becbd08a823 Mon Sep 17 00:00:00 2001 From: Anirudh Sudhir Date: Thu, 11 Apr 2024 13:01:57 +0530 Subject: [PATCH] test: remove rendered/ from test/ --- .gitignore | 3 +- pkg/engine/anna_engine_test.go | 4 +- pkg/engine/engine_integration_test.go | 4 ++ pkg/engine/engine_test.go | 3 +- pkg/engine/user_engine_test.go | 1 + .../render_page/rendered/posts/got.html | 18 --------- .../rendered/posts.html | 40 ------------------- .../render_page/rendered/posts/got.html | 18 --------- test/engine/render_tags/rendered/tags.html | 13 ------ .../render_tags/rendered/tags/blogs.html | 13 ------ .../render_tags/rendered/tags/tech.html | 13 ------ .../render_user_defined/rendered/index.html | 10 ----- .../rendered/posts/hello.html | 10 ----- test/engine/sitemap/got_sitemap.xml | 6 +-- 14 files changed, 13 insertions(+), 143 deletions(-) delete mode 100644 test/engine/engine/render_page/rendered/posts/got.html delete mode 100644 test/engine/render_engine_generated/rendered/posts.html delete mode 100644 test/engine/render_page/rendered/posts/got.html delete mode 100644 test/engine/render_tags/rendered/tags.html delete mode 100644 test/engine/render_tags/rendered/tags/blogs.html delete mode 100644 test/engine/render_tags/rendered/tags/tech.html delete mode 100644 test/engine/render_user_defined/rendered/index.html delete mode 100644 test/engine/render_user_defined/rendered/posts/hello.html diff --git a/.gitignore b/.gitignore index 211b43d..f092ccb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -!rendered/ -site/rendered/ +**/rendered/ anna !anna/ *.exe diff --git a/pkg/engine/anna_engine_test.go b/pkg/engine/anna_engine_test.go index 985ccd0..064910c 100644 --- a/pkg/engine/anna_engine_test.go +++ b/pkg/engine/anna_engine_test.go @@ -61,6 +61,7 @@ func TestRenderTags(t *testing.T) { if err != nil { t.Errorf("%v", err) } + os.MkdirAll(TestDirPath+"render_tags/rendered", 0750) e.RenderTags(fileOutPath, templ) t.Run("render tag.html", func(t *testing.T) { @@ -105,12 +106,11 @@ func TestRenderTags(t *testing.T) { } if !slices.Equal(got_tech_file, want_tech_file) { - t.Errorf("The expected and generated tech.html tag-subpage can be found in test/engine/render_tags/rendered/tags/") + t.Errorf("The expected and generated tech.html tag-subpage can be found in test/engine/render_tags/rendered/tags/") } }) } - func TestGenerateMergedJson(t *testing.T) { t.Run("test json creation from e.Templates", func(t *testing.T) { e := engine.Engine{ diff --git a/pkg/engine/engine_integration_test.go b/pkg/engine/engine_integration_test.go index 906b7fb..cc80219 100644 --- a/pkg/engine/engine_integration_test.go +++ b/pkg/engine/engine_integration_test.go @@ -22,11 +22,13 @@ func TestRenderUserDefinedPages(t *testing.T) { parser.TemplateData{ FilenameWithoutExtension: "index", Body: template.HTML("

Index Page

"), + CompleteURL: "index.html", } engine.Templates["posts/hello.md"] = parser.TemplateData{ FilenameWithoutExtension: "hello", Body: template.HTML("

Hello World

"), + CompleteURL: "posts/hello.html", } t.Run("render a set of user defined pages", func(t *testing.T) { @@ -35,6 +37,8 @@ func TestRenderUserDefinedPages(t *testing.T) { if err != nil { t.Errorf("%v", err) } + + os.MkdirAll(TestDirPath+"render_user_defined/rendered", 0750) engine.RenderUserDefinedPages(TestDirPath+"render_user_defined/", templ) want_index_file, err := os.ReadFile(TestDirPath + "render_user_defined/want_index.html") diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index f39cf89..fc9c004 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -46,7 +46,8 @@ func TestRenderPage(t *testing.T) { t.Errorf("%v", err) } - engine.RenderPage(TestDirPath+"engine/render_page/", "posts/got.md", page, templ, "page") + os.MkdirAll(TestDirPath+"render_page/rendered", 0750) + engine.RenderPage(TestDirPath+"render_page/", "posts/got.md", page, templ, "page") got_file, err := os.ReadFile(TestDirPath + "render_page/rendered/posts/got.html") if err != nil { diff --git a/pkg/engine/user_engine_test.go b/pkg/engine/user_engine_test.go index 3c046cc..c62e6ee 100644 --- a/pkg/engine/user_engine_test.go +++ b/pkg/engine/user_engine_test.go @@ -53,6 +53,7 @@ func TestRenderEngineGeneratedFiles(t *testing.T) { t.Errorf("%v", err) } + os.MkdirAll(TestDirPath+"render_engine_generated/rendered", 0750) engine.RenderEngineGeneratedFiles(TestDirPath+"render_engine_generated/", templ) want_posts_file, err := os.ReadFile(TestDirPath + "render_engine_generated/want_posts.html") diff --git a/test/engine/engine/render_page/rendered/posts/got.html b/test/engine/engine/render_page/rendered/posts/got.html deleted file mode 100644 index 6cfcd99..0000000 --- a/test/engine/engine/render_page/rendered/posts/got.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -
- -
-blog -
- -
-thoughts -
- -
-

Hello World

- - diff --git a/test/engine/render_engine_generated/rendered/posts.html b/test/engine/render_engine_generated/rendered/posts.html deleted file mode 100644 index 9a5b556..0000000 --- a/test/engine/render_engine_generated/rendered/posts.html +++ /dev/null @@ -1,40 +0,0 @@ - - - -
-
- - -
-
-

file1

-

Description of file 1

-
-

2024-03-28

-
- - - -
-
-

file2

-

Description of file 2

-
-

2024-03-28

-
- - - -
-
-

file3

-

Description of file 3

-
-

2024-03-28

-
- - -
-
- - diff --git a/test/engine/render_page/rendered/posts/got.html b/test/engine/render_page/rendered/posts/got.html deleted file mode 100644 index 6cfcd99..0000000 --- a/test/engine/render_page/rendered/posts/got.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - -
- -
-blog -
- -
-thoughts -
- -
-

Hello World

- - diff --git a/test/engine/render_tags/rendered/tags.html b/test/engine/render_tags/rendered/tags.html deleted file mode 100644 index 1c73adc..0000000 --- a/test/engine/render_tags/rendered/tags.html +++ /dev/null @@ -1,13 +0,0 @@ - - -
-
- -blogs - -tech - -
-
- - diff --git a/test/engine/render_tags/rendered/tags/blogs.html b/test/engine/render_tags/rendered/tags/blogs.html deleted file mode 100644 index 3d48ac2..0000000 --- a/test/engine/render_tags/rendered/tags/blogs.html +++ /dev/null @@ -1,13 +0,0 @@ - - -
-
- -file1 - -file2 - -
-
- - diff --git a/test/engine/render_tags/rendered/tags/tech.html b/test/engine/render_tags/rendered/tags/tech.html deleted file mode 100644 index 88497f7..0000000 --- a/test/engine/render_tags/rendered/tags/tech.html +++ /dev/null @@ -1,13 +0,0 @@ - - -
-
- -file2 - -file3 - -
-
- - diff --git a/test/engine/render_user_defined/rendered/index.html b/test/engine/render_user_defined/rendered/index.html deleted file mode 100644 index c3dcf98..0000000 --- a/test/engine/render_user_defined/rendered/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -
- -
-

Index Page

- - diff --git a/test/engine/render_user_defined/rendered/posts/hello.html b/test/engine/render_user_defined/rendered/posts/hello.html deleted file mode 100644 index d4fc935..0000000 --- a/test/engine/render_user_defined/rendered/posts/hello.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - -
- -
-

Hello World

- - diff --git a/test/engine/sitemap/got_sitemap.xml b/test/engine/sitemap/got_sitemap.xml index dc94b5b..03e81a4 100644 --- a/test/engine/sitemap/got_sitemap.xml +++ b/test/engine/sitemap/got_sitemap.xml @@ -1,15 +1,15 @@ - example.org/index.html + example.org/about.html 2024-02-23 - example.org/research.html + example.org/index.html 2024-02-23 - example.org/about.html + example.org/research.html 2024-02-23