summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2022-08-06 13:41:11 +0700
committerShulhan <ms@kilabit.info>2022-08-06 13:41:11 +0700
commit4624f716d8e2a8ed78326025323417cc9c5d6dd0 (patch)
tree8ee61c1f16a59b480abc7440f067984799a5a6e1
parent427da25f96d0a54294a27d376d4833622fba50f0 (diff)
downloadciigo-4624f716d8e2a8ed78326025323417cc9c5d6dd0.tar.xz
all: cleaning up codes
-rw-r--r--ciigo.go60
-rw-r--r--ciigo_test.go10
-rw-r--r--convert_options.go6
-rw-r--r--converter.go28
-rw-r--r--filehtml.go2
-rw-r--r--filemarkup.go8
-rw-r--r--serve_options.go2
-rw-r--r--server.go28
-rw-r--r--watcher.go16
-rw-r--r--watcher_test.go26
10 files changed, 93 insertions, 93 deletions
diff --git a/ciigo.go b/ciigo.go
index 07488bd..e4ece1c 100644
--- a/ciigo.go
+++ b/ciigo.go
@@ -21,8 +21,8 @@ import (
)
const (
- extAsciidoc = ".adoc"
- internalTemplatePath = "_internal/.template"
+ extAsciidoc = `.adoc`
+ internalTemplatePath = `_internal/.template`
)
// nolint: gochecknoglobals
@@ -39,7 +39,7 @@ var (
// See template_index_html.go for template format.
func Convert(opts *ConvertOptions) (err error) {
var (
- logp = "Convert"
+ logp = `Convert`
converter *Converter
fileMarkups map[string]*fileMarkup
@@ -50,17 +50,17 @@ func Convert(opts *ConvertOptions) (err error) {
}
err = opts.init()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
converter, err = NewConverter(opts.HtmlTemplate)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
fileMarkups, err = listFileMarkups(opts.Root, opts.excRE)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
converter.convertFileMarkups(fileMarkups, false)
@@ -80,7 +80,7 @@ func Convert(opts *ConvertOptions) (err error) {
// See template_index_html.go for template format.
func GoEmbed(opts *EmbedOptions) (err error) {
var (
- logp = "GoEmbed"
+ logp = `GoEmbed`
converter *Converter
fileMarkups map[string]*fileMarkup
@@ -94,17 +94,17 @@ func GoEmbed(opts *EmbedOptions) (err error) {
}
err = opts.init()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
converter, err = NewConverter(opts.HtmlTemplate)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
fileMarkups, err = listFileMarkups(opts.Root, opts.excRE)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
if isHtmlTemplateNewer(opts) {
@@ -121,19 +121,19 @@ func GoEmbed(opts *EmbedOptions) (err error) {
mfs, err = memfs.New(mfsOpts)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
if len(opts.HtmlTemplate) > 0 {
_, err = mfs.AddFile(internalTemplatePath, opts.HtmlTemplate)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
}
err = mfs.GoEmbed()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
return nil
@@ -143,7 +143,7 @@ func GoEmbed(opts *EmbedOptions) (err error) {
// "address".
func Serve(opts *ServeOptions) (err error) {
var (
- logp = "Serve"
+ logp = `Serve`
srv *server
)
@@ -152,16 +152,16 @@ func Serve(opts *ServeOptions) (err error) {
}
err = opts.init()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
srv, err = newServer(opts)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
err = srv.start()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
return nil
}
@@ -176,7 +176,7 @@ func Serve(opts *ServeOptions) (err error) {
// default HTML template.
func Watch(opts *ConvertOptions) (err error) {
var (
- logp = "Watch"
+ logp = `Watch`
converter *Converter
w *watcher
@@ -187,22 +187,22 @@ func Watch(opts *ConvertOptions) (err error) {
}
err = opts.init()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
converter, err = NewConverter(opts.HtmlTemplate)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
w, err = newWatcher(converter, opts)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
err = w.start()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
return nil
@@ -212,7 +212,7 @@ func Watch(opts *ConvertOptions) (err error) {
// newer than embedded GoFileName.
func isHtmlTemplateNewer(opts *EmbedOptions) bool {
var (
- logp = "isHtmlTemplateNewer"
+ logp = `isHtmlTemplateNewer`
fiHtmlTmpl fs.FileInfo
fiGoEmbed fs.FileInfo
@@ -225,7 +225,7 @@ func isHtmlTemplateNewer(opts *EmbedOptions) bool {
fiHtmlTmpl, err = os.Stat(opts.HtmlTemplate)
if err != nil {
- log.Fatalf("%s: %s", logp, err)
+ log.Fatalf(`%s: %s`, logp, err)
}
if len(opts.EmbedOptions.GoFileName) == 0 {
@@ -238,7 +238,7 @@ func isHtmlTemplateNewer(opts *EmbedOptions) bool {
if os.IsNotExist(err) {
return false
}
- log.Fatalf("%s: %s", logp, err)
+ log.Fatalf(`%s: %s`, logp, err)
}
return fiHtmlTmpl.ModTime().After(fiGoEmbed.ModTime())
@@ -254,7 +254,7 @@ func listFileMarkups(dir string, excRE []*regexp.Regexp) (
fileMarkups map[string]*fileMarkup, err error,
) {
var (
- logp = "listFileMarkups"
+ logp = `listFileMarkups`
d *os.File
fi os.FileInfo
@@ -269,12 +269,12 @@ func listFileMarkups(dir string, excRE []*regexp.Regexp) (
d, err = os.Open(dir)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
fis, err = d.Readdir(0)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
fileMarkups = make(map[string]*fileMarkup)
@@ -294,7 +294,7 @@ func listFileMarkups(dir string, excRE []*regexp.Regexp) (
}
fmarkups, err = listFileMarkups(filePath, excRE)
if err != nil {
- return nil, fmt.Errorf("%s: %s: %w", logp, filePath, err)
+ return nil, fmt.Errorf(`%s: %s: %w`, logp, filePath, err)
}
for k, fmarkup = range fmarkups {
fileMarkups[k] = fmarkup
@@ -311,7 +311,7 @@ func listFileMarkups(dir string, excRE []*regexp.Regexp) (
}
fmarkup, err = newFileMarkup(filePath, fi)
if err != nil {
- return nil, fmt.Errorf("%s: %s: %w", logp, filePath, err)
+ return nil, fmt.Errorf(`%s: %s: %w`, logp, filePath, err)
}
fileMarkups[filePath] = fmarkup
}
diff --git a/ciigo_test.go b/ciigo_test.go
index f2bee3d..64becf0 100644
--- a/ciigo_test.go
+++ b/ciigo_test.go
@@ -20,7 +20,7 @@ func TestListFileMarkups(t *testing.T) {
var cases = []testCase{{
excRegex: `(ex)/.*`,
exp: []string{
- "testdata/in/clu/de/file.adoc",
+ `testdata/in/clu/de/file.adoc`,
},
}, {
excRegex: `(in|ex)/.*`,
@@ -29,13 +29,13 @@ func TestListFileMarkups(t *testing.T) {
}, {
excRegex: `file$`,
exp: []string{
- "testdata/ex/clu/de/file.adoc",
- "testdata/in/clu/de/file.adoc",
+ `testdata/ex/clu/de/file.adoc`,
+ `testdata/in/clu/de/file.adoc`,
},
}}
var (
- dir = "testdata"
+ dir = `testdata`
c testCase
excre *regexp.Regexp
@@ -60,6 +60,6 @@ func TestListFileMarkups(t *testing.T) {
sort.Strings(got)
- test.Assert(t, "list", c.exp, got)
+ test.Assert(t, `list`, c.exp, got)
}
}
diff --git a/convert_options.go b/convert_options.go
index 554b6e8..d8c3cf0 100644
--- a/convert_options.go
+++ b/convert_options.go
@@ -10,7 +10,7 @@ import (
const (
// DefaultRoot define default Root value for GenerateOptions.
- DefaultRoot = "."
+ DefaultRoot = `.`
)
// ConvertOptions define the options to use on Convert function.
@@ -35,7 +35,7 @@ type ConvertOptions struct {
func (opts *ConvertOptions) init() (err error) {
var (
- logp = "ConvertOptions.init"
+ logp = `ConvertOptions.init`
)
if len(opts.Root) == 0 {
@@ -46,7 +46,7 @@ func (opts *ConvertOptions) init() (err error) {
re, err = regexp.Compile(opts.Exclude)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
opts.excRE = append(opts.excRE, re)
diff --git a/converter.go b/converter.go
index be8d9a0..2d5c620 100644
--- a/converter.go
+++ b/converter.go
@@ -24,7 +24,7 @@ type Converter struct {
// If htmlTemplate is empty, it will use the internal, predefined template.
func NewConverter(htmlTemplate string) (converter *Converter, err error) {
var (
- logp = "NewConverter"
+ logp = `NewConverter`
tmplContent string
bhtml []byte
@@ -32,7 +32,7 @@ func NewConverter(htmlTemplate string) (converter *Converter, err error) {
converter = &Converter{}
- converter.tmpl = template.New("")
+ converter.tmpl = template.New(``)
if len(htmlTemplate) == 0 {
tmplContent = templateIndexHTML
@@ -41,7 +41,7 @@ func NewConverter(htmlTemplate string) (converter *Converter, err error) {
bhtml, err = os.ReadFile(converter.htmlTemplate)
if err != nil {
- return nil, fmt.Errorf("%s: %s: %w", logp, converter.htmlTemplate, err)
+ return nil, fmt.Errorf(`%s: %s: %w`, logp, converter.htmlTemplate, err)
}
tmplContent = string(bhtml)
@@ -49,13 +49,13 @@ func NewConverter(htmlTemplate string) (converter *Converter, err error) {
converter.tmpl, err = converter.tmpl.Parse(tmplContent)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
- converter.tmplSearch = template.New("search")
+ converter.tmplSearch = template.New(`search`)
converter.tmplSearch, err = converter.tmplSearch.Parse(templateSearch)
if err != nil {
- return nil, fmt.Errorf("%s: %s: %w", logp, templateSearch, err)
+ return nil, fmt.Errorf(`%s: %s: %w`, logp, templateSearch, err)
}
return converter, nil
@@ -64,7 +64,7 @@ func NewConverter(htmlTemplate string) (converter *Converter, err error) {
// convertFileMarkups convert markup files into HTML.
func (converter *Converter) convertFileMarkups(fileMarkups map[string]*fileMarkup, isForce bool) {
var (
- logp = "convertFileMarkups"
+ logp = `convertFileMarkups`
fmarkup *fileMarkup
err error
@@ -79,7 +79,7 @@ func (converter *Converter) convertFileMarkups(fileMarkups map[string]*fileMarku
err = converter.ToHtmlFile(fmarkup.path, fmarkup.pathHtml)
if err != nil {
- log.Printf("%s: %s", logp, err)
+ log.Printf(`%s: %s`, logp, err)
} else {
fmt.Printf("%s: converting %s\n", logp, fmarkup.path)
}
@@ -107,7 +107,7 @@ func (converter *Converter) SetHtmlTemplateFile(pathHtmlTemplate string) (err er
// ToHtmlFile convert the AsciiDoc file to HTML.
func (converter *Converter) ToHtmlFile(pathAdoc, pathHtml string) (err error) {
var (
- logp = "ToHtmlFile"
+ logp = `ToHtmlFile`
fhtml = newFileHtml()
htmlBody string
@@ -117,12 +117,12 @@ func (converter *Converter) ToHtmlFile(pathAdoc, pathHtml string) (err error) {
doc, err = asciidoctor.Open(pathAdoc)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
err = doc.ToHTMLBody(&fhtml.rawBody)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
fhtml.unpackAdocMetadata(doc)
@@ -132,17 +132,17 @@ func (converter *Converter) ToHtmlFile(pathAdoc, pathHtml string) (err error) {
f, err = os.Create(pathHtml)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
err = converter.tmpl.Execute(f, fhtml)
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
err = f.Close()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
return nil
diff --git a/filehtml.go b/filehtml.go
index 5d889a0..4c3ea1c 100644
--- a/filehtml.go
+++ b/filehtml.go
@@ -11,7 +11,7 @@ import (
)
const (
- metadataStylesheet = "stylesheet"
+ metadataStylesheet = `stylesheet`
)
// fileHtml represent an HTML metadata for header and its body.
diff --git a/filemarkup.go b/filemarkup.go
index 4defea3..e0eb994 100644
--- a/filemarkup.go
+++ b/filemarkup.go
@@ -20,18 +20,18 @@ type fileMarkup struct {
func newFileMarkup(filePath string, fi os.FileInfo) (fmarkup *fileMarkup, err error) {
var (
- logp = "newFileMarkup"
+ logp = `newFileMarkup`
ext string
)
if len(filePath) == 0 {
- return nil, fmt.Errorf("%s: empty path", logp)
+ return nil, fmt.Errorf(`%s: empty path`, logp)
}
if fi == nil {
fi, err = os.Stat(filePath)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
}
@@ -43,7 +43,7 @@ func newFileMarkup(filePath string, fi os.FileInfo) (fmarkup *fileMarkup, err er
basePath: strings.TrimSuffix(filePath, ext),
}
- fmarkup.pathHtml = fmarkup.basePath + ".html"
+ fmarkup.pathHtml = fmarkup.basePath + `.html`
return fmarkup, nil
}
diff --git a/serve_options.go b/serve_options.go
index 29ff41f..06b8465 100644
--- a/serve_options.go
+++ b/serve_options.go
@@ -6,7 +6,7 @@ package ciigo
import "github.com/shuLhan/share/lib/memfs"
const (
- defAddress = ":8080"
+ defAddress = `:8080`
)
// ServeOptions contains the options to use on Serve function.
diff --git a/server.go b/server.go
index ff4eb7d..9765e04 100644
--- a/server.go
+++ b/server.go
@@ -28,7 +28,7 @@ type server struct {
// embedded HTML template.
func newServer(opts *ServeOptions) (srv *server, err error) {
var (
- logp = "newServer"
+ logp = `newServer`
tmplNode *memfs.Node
httpdOpts *libhttp.ServerOptions
@@ -58,12 +58,12 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
srv.http, err = libhttp.NewServer(httpdOpts)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
epInSearch = &libhttp.Endpoint{
Method: libhttp.RequestMethodGet,
- Path: "/_internal/search",
+ Path: `/_internal/search`,
RequestType: libhttp.RequestTypeQuery,
ResponseType: libhttp.ResponseTypeHTML,
Call: srv.onSearch,
@@ -71,12 +71,12 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
err = srv.http.RegisterEndpoint(epInSearch)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
srv.converter, err = NewConverter(opts.HtmlTemplate)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
// Optionally, load HTML template from memory file system.
@@ -84,14 +84,14 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
if tmplNode != nil {
srv.converter.tmpl, err = srv.converter.tmpl.Parse(string(tmplNode.Content))
if err != nil {
- return nil, fmt.Errorf("%s: %s", logp, err)
+ return nil, fmt.Errorf(`%s: %s`, logp, err)
}
}
if opts.IsDevelopment {
srv.watcher, err = newWatcher(srv.converter, &opts.ConvertOptions)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
srv.converter.convertFileMarkups(srv.watcher.fileMarkups, false)
@@ -103,13 +103,13 @@ func newServer(opts *ServeOptions) (srv *server, err error) {
// start the web server.
func (srv *server) start() (err error) {
var (
- logp = "start"
+ logp = `start`
)
if srv.opts.IsDevelopment {
err = srv.watcher.start()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
}
@@ -118,7 +118,7 @@ func (srv *server) start() (err error) {
err = srv.http.Start()
if err != nil {
- return fmt.Errorf("%s: %w", logp, err)
+ return fmt.Errorf(`%s: %w`, logp, err)
}
return nil
@@ -126,7 +126,7 @@ func (srv *server) start() (err error) {
func (srv *server) onSearch(epr *libhttp.EndpointRequest) (resBody []byte, err error) {
var (
- logp = "onSearch"
+ logp = `onSearch`
fhtml *fileHtml
buf bytes.Buffer
@@ -134,12 +134,12 @@ func (srv *server) onSearch(epr *libhttp.EndpointRequest) (resBody []byte, err e
results []memfs.SearchResult
)
- q = epr.HttpRequest.Form.Get("q")
+ q = epr.HttpRequest.Form.Get(`q`)
results = srv.http.Options.Memfs.Search(strings.Fields(q), 0)
err = srv.converter.tmplSearch.Execute(&buf, results)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
fhtml = &fileHtml{
@@ -150,7 +150,7 @@ func (srv *server) onSearch(epr *libhttp.EndpointRequest) (resBody []byte, err e
err = srv.converter.tmpl.Execute(&buf, fhtml)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
resBody = buf.Bytes()
diff --git a/watcher.go b/watcher.go
index aa70bda..90d29ef 100644
--- a/watcher.go
+++ b/watcher.go
@@ -45,7 +45,7 @@ type watcher struct {
// +--> UPDATE --> Converter.htmlTemplateReload()
func newWatcher(converter *Converter, convertOpts *ConvertOptions) (w *watcher, err error) {
var (
- logp = "newWatcher"
+ logp = `newWatcher`
)
w = &watcher{
@@ -74,7 +74,7 @@ func newWatcher(converter *Converter, convertOpts *ConvertOptions) (w *watcher,
w.fileMarkups, err = listFileMarkups(convertOpts.Root, convertOpts.excRE)
if err != nil {
- return nil, fmt.Errorf("%s: %w", logp, err)
+ return nil, fmt.Errorf(`%s: %w`, logp, err)
}
return w, nil
@@ -84,7 +84,7 @@ func newWatcher(converter *Converter, convertOpts *ConvertOptions) (w *watcher,
func (w *watcher) start() (err error) {
err = w.watchDir.Start()
if err != nil {
- return fmt.Errorf("start: %w", err)
+ return fmt.Errorf(`start: %w`, err)
}
go w.watchFileMarkup()
@@ -92,7 +92,7 @@ func (w *watcher) start() (err error) {
if len(w.converter.htmlTemplate) > 0 {
w.watchTemplate, err = memfs.NewWatcher(w.converter.htmlTemplate, 0)
if err != nil {
- return fmt.Errorf("start: %w", err)
+ return fmt.Errorf(`start: %w`, err)
}
go w.watchHtmlTemplate()
}
@@ -103,7 +103,7 @@ func (w *watcher) start() (err error) {
// and re-generate them into HTML file when changed.
func (w *watcher) watchFileMarkup() {
var (
- logp = "watchFileMarkup"
+ logp = `watchFileMarkup`
ns memfs.NodeState
fmarkup *fileMarkup
@@ -160,7 +160,7 @@ func (w *watcher) watchFileMarkup() {
err = w.converter.ToHtmlFile(fmarkup.path, fmarkup.pathHtml)
if err != nil {
- log.Printf("%s: %s", logp, err)
+ log.Printf(`%s: %s`, logp, err)
}
w.changes.Push(fmarkup)
@@ -171,7 +171,7 @@ func (w *watcher) watchFileMarkup() {
// files.
func (w *watcher) watchHtmlTemplate() {
var (
- logp = "watchHtmlTemplate"
+ logp = `watchHtmlTemplate`
ns memfs.NodeState
err error
@@ -188,7 +188,7 @@ func (w *watcher) watchHtmlTemplate() {
err = w.converter.SetHtmlTemplateFile(w.converter.htmlTemplate)
}
if err != nil {
- log.Printf("%s: %s", logp, err)
+ log.Printf(`%s: %s`, logp, err)
continue
}
diff --git a/watcher_test.go b/watcher_test.go
index 0e082f2..6b219d1 100644
--- a/watcher_test.go
+++ b/watcher_test.go
@@ -21,7 +21,7 @@ var (
func TestWatcher(t *testing.T) {
var (
- testDir = "testdata/watcher"
+ testDir = `testdata/watcher`
convertOpts = ConvertOptions{
Root: testDir,
}
@@ -44,7 +44,7 @@ func TestWatcher(t *testing.T) {
os.RemoveAll(testDir)
})
- converter, err = NewConverter("testdata/html.tmpl")
+ converter, err = NewConverter(`testdata/html.tmpl`)
if err != nil {
t.Fatal(err)
}
@@ -64,9 +64,9 @@ func TestWatcher(t *testing.T) {
t.Fatal(err)
}
- t.Run("createAdocFile", testCreate)
- t.Run("updateAdocFile", testUpdate)
- t.Run("deleteAdocFile", testDelete)
+ t.Run(`createAdocFile`, testCreate)
+ t.Run(`updateAdocFile`, testUpdate)
+ t.Run(`deleteAdocFile`, testDelete)
}
func testCreate(t *testing.T) {
@@ -77,7 +77,7 @@ func testCreate(t *testing.T) {
gotBody []byte
)
- testFileAdoc = filepath.Join(testWatcher.dir, "index.adoc")
+ testFileAdoc = filepath.Join(testWatcher.dir, `index.adoc`)
testAdocFile, err = os.Create(testFileAdoc)
if err != nil {
t.Fatal(err)
@@ -85,7 +85,7 @@ func testCreate(t *testing.T) {
got = waitChanges()
- test.Assert(t, "New adoc file created", testFileAdoc, got.path)
+ test.Assert(t, `New adoc file created`, testFileAdoc, got.path)
expBody = `<!DOCTYPE>
<html>
@@ -108,7 +108,7 @@ func testCreate(t *testing.T) {
}
gotBody = removeFooter(gotBody)
- test.Assert(t, "HTML body", expBody, string(gotBody))
+ test.Assert(t, `HTML body`, expBody, string(gotBody))
}
func testUpdate(t *testing.T) {
@@ -119,7 +119,7 @@ func testUpdate(t *testing.T) {
got *fileMarkup
)
- _, err = testAdocFile.WriteString("= Hello")
+ _, err = testAdocFile.WriteString(`= Hello`)
if err != nil {
t.Fatal(err)
}
@@ -129,7 +129,7 @@ func testUpdate(t *testing.T) {
}
got = waitChanges()
- test.Assert(t, "adoc file updated", testFileAdoc, got.path)
+ test.Assert(t, `adoc file updated`, testFileAdoc, got.path)
expBody = `<!DOCTYPE>
<html>
@@ -154,7 +154,7 @@ func testUpdate(t *testing.T) {
gotBody = removeFooter(gotBody)
- test.Assert(t, "HTML body", expBody, string(gotBody))
+ test.Assert(t, `HTML body`, expBody, string(gotBody))
}
func testDelete(t *testing.T) {
@@ -175,10 +175,10 @@ func testDelete(t *testing.T) {
}
got = waitChanges()
- test.Assert(t, "adoc file updated", testFileAdoc, got.path)
+ test.Assert(t, `adoc file updated`, testFileAdoc, got.path)
_, gotIsExist = testWatcher.fileMarkups[testFileAdoc]
- test.Assert(t, "adoc file deleted", false, gotIsExist)
+ test.Assert(t, `adoc file deleted`, false, gotIsExist)
}
// removeFooter remove the footer from generated HTML since its contains date