Skip to content

Add unit and integration testing for the sketch recursive load functionality #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 30, 2019
Merged

Add unit and integration testing for the sketch recursive load functionality #462

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ebca955
add testcases to cover https://github.com/arduino/arduino-cli/issues/…
Oct 29, 2019
f1c28ff
add test to check error throw on symlink loop detection
Oct 29, 2019
7f66563
create symlink via test code to ensure cross platform creation
Oct 30, 2019
1ea0685
fixed assert to make the check cross platform
Oct 30, 2019
3d63c78
fixed all symlink check asserts to make the check cross platform
Oct 30, 2019
3db1dc9
nitpicking
Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add testcases to cover #358 (Symbolic link as sketch directory) and #424 
 (folder with .ino extension)
  • Loading branch information
Roberto Sora committed Oct 29, 2019
commit ebca955cebd75e1e3506865da4af2de0c6ce1c60
40 changes: 40 additions & 0 deletions arduino/builder/sketch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,46 @@ func TestLoadSketchFolder(t *testing.T) {
require.Equal(t, "helper.h", filepath.Base(s.AdditionalFiles[2].Path))
}

func TestLoadSketchFolderSymlink(t *testing.T) {
// pass the path to the sketch folder
sketchPath := filepath.Join("testdata", t.Name())
mainFilePath := filepath.Join(sketchPath, t.Name()+".ino")
s, err := builder.SketchLoad(sketchPath, "")
require.Nil(t, err)
require.NotNil(t, s)
require.Equal(t, mainFilePath, s.MainFile.Path)
require.Equal(t, sketchPath, s.LocationPath)
require.Len(t, s.OtherSketchFiles, 2)
require.Equal(t, "old.pde", filepath.Base(s.OtherSketchFiles[0].Path))
require.Equal(t, "other.ino", filepath.Base(s.OtherSketchFiles[1].Path))
require.Len(t, s.AdditionalFiles, 3)
require.Equal(t, "header.h", filepath.Base(s.AdditionalFiles[0].Path))
require.Equal(t, "s_file.S", filepath.Base(s.AdditionalFiles[1].Path))
require.Equal(t, "helper.h", filepath.Base(s.AdditionalFiles[2].Path))

// pass the path to the main file
sketchPath = mainFilePath
s, err = builder.SketchLoad(sketchPath, "")
require.Nil(t, err)
require.NotNil(t, s)
require.Equal(t, mainFilePath, s.MainFile.Path)
require.Len(t, s.OtherSketchFiles, 2)
require.Equal(t, "old.pde", filepath.Base(s.OtherSketchFiles[0].Path))
require.Equal(t, "other.ino", filepath.Base(s.OtherSketchFiles[1].Path))
require.Len(t, s.AdditionalFiles, 3)
require.Equal(t, "header.h", filepath.Base(s.AdditionalFiles[0].Path))
require.Equal(t, "s_file.S", filepath.Base(s.AdditionalFiles[1].Path))
require.Equal(t, "helper.h", filepath.Base(s.AdditionalFiles[2].Path))
}

func TestLoadSketchFolderIno(t *testing.T) {
// pass the path to the sketch folder
sketchPath := filepath.Join("testdata", t.Name())
_, err := builder.SketchLoad(sketchPath, "")
require.Error(t, err)
require.Contains(t, err.Error(), "sketch must not be a directory")
}

func TestLoadSketchFolderWrongMain(t *testing.T) {
sketchPath := filepath.Join("testdata", t.Name())
_, err := builder.SketchLoad(sketchPath, "")
Expand Down
7 changes: 7 additions & 0 deletions ...der/testdata/TestLoadSketchFolderIno/TestLoadSketchFolderIno.ino/TestLoadSketchFolder.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
void setup() {

}

void loop() {

}
1 change: 1 addition & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlink
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TestLoadSketchFolderSymlinkSrc
2 changes: 2 additions & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/.#sketch.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
void setup()
void loop) }
7 changes: 7 additions & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/TestLoadSketchFolderSymlink.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
void setup() {

}

void loop() {

}
Empty file added arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/doc.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define FOO "BAR"
Empty file added arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/old.pde
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/other.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
String hello() {
return "world";
}
Empty file added arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/s_file.S
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/dont_load_me.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include <testlib4.h>
#error "Whattya looking at?"
Empty file added arduino/builder/testdata/TestLoadSketchFolderSymlinkSrc/src/helper.h
View file
Open in desktop
Empty file.