Migrated TestCompileWithBuildPropertiesFlag from test_compile_part_1.py to compile_part_1_test.go

Author: MatteoPologruto

internal/integrationtest/compile/compile_part_1_test.go

@@ -312,3 +312,71 @@ func TestCompileWithoutPrecompiledLibraries(t *testing.T) {
 	_, _, err = cli.Run("compile", "-b", "arduino:samd:mkrvidor4000", sketchPath.String())
 	require.NoError(t, err)
 }
+
+func TestCompileWithBuildPropertiesFlag(t *testing.T) {
+	env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t)
+	defer env.CleanUp()
+
+	// Init the environment explicitly
+	_, _, err := cli.Run("core", "update-index")
+	require.NoError(t, err)
+
+	// Install Arduino AVR Boards
+	_, _, err = cli.Run("core", "install", "arduino:avr@1.8.3")
+	require.NoError(t, err)
+
+	// Copy sketch
+	sketchName := "sketch_with_single_string_define"
+	p, err := paths.Getwd()
+	require.NoError(t, err)
+	require.NotNil(t, p)
+	testSketch := p.Parent().Join("testdata", sketchName)
+	sketchPath := cli.SketchbookDir().Join(sketchName)
+	err = testSketch.CopyDirTo(sketchPath)
+	require.NoError(t, err)
+
+	fqbn := "arduino:avr:uno"
+
+	// Compile using a build property with quotes
+	_, stderr, err := cli.Run("compile", "-b", fqbn, "--build-properties=\"build.extra_flags=\"-DMY_DEFINE=\"hello world\"\"", sketchPath.String(), "--verbose", "--clean")
+	require.Error(t, err)
+	require.NotContains(t, string(stderr), "Flag --build-properties has been deprecated, please use --build-property instead.")
+
+	// Try again with quotes
+	_, stderr, err = cli.Run("compile", "-b", fqbn, "--build-properties=\"build.extra_flags=-DMY_DEFINE=\"hello\"\"", sketchPath.String(), "--verbose", "--clean")
+	require.Error(t, err)
+	require.NotContains(t, string(stderr), "Flag --build-properties has been deprecated, please use --build-property instead.")
+
+	// Copy sketch
+	sketchName = "sketch_with_single_int_define"
+	testSketch = p.Parent().Join("testdata", sketchName)
+	sketchPath = cli.SketchbookDir().Join(sketchName)
+	err = testSketch.CopyDirTo(sketchPath)
+	require.NoError(t, err)
+
+	// Try without quotes
+	stdout, stderr, err := cli.Run("compile", "-b", fqbn, "--build-properties=\"build.extra_flags=-DMY_DEFINE=1\"", sketchPath.String(), "--verbose", "--clean")
+	require.NoError(t, err)
+	require.Contains(t, string(stderr), "Flag --build-properties has been deprecated, please use --build-property instead.")
+	require.Contains(t, string(stdout), "-DMY_DEFINE=1")
+
+	// Copy sketch
+	sketchName = "sketch_with_multiple_int_defines"
+	testSketch = p.Parent().Join("testdata", sketchName)
+	sketchPath = cli.SketchbookDir().Join(sketchName)
+	err = testSketch.CopyDirTo(sketchPath)
+	require.NoError(t, err)
+
+	stdout, stderr, err = cli.Run("compile",
+		"-b",
+		fqbn,
+		"--build-properties",
+		"build.extra_flags=-DFIRST_PIN=1,compiler.cpp.extra_flags=-DSECOND_PIN=2",
+		sketchPath.String(),
+		"--verbose",
+		"--clean")
+	require.NoError(t, err)
+	require.Contains(t, string(stderr), "Flag --build-properties has been deprecated, please use --build-property instead.")
+	require.Contains(t, string(stdout), "-DFIRST_PIN=1")
+	require.Contains(t, string(stdout), "-DSECOND_PIN=2")
+}

internal/integrationtest/testdata/sketch_with_multiple_int_defines/sketch_with_multiple_int_defines.ino

@@ -0,0 +1,12 @@
+
+const int MY_FIRST_PIN = FIRST_PIN;
+const int MY_SECOND_PIN = SECOND_PIN;
+
+void setup() {
+    Serial.begin(9600);
+    Serial.println(MY_FIRST_PIN);
+    Serial.println(MY_SECOND_PIN);
+}
+
+void loop() {
+}

internal/integrationtest/testdata/sketch_with_single_int_define/sketch_with_single_int_define.ino

@@ -0,0 +1,10 @@
+
+const int FOO = MY_DEFINE;
+
+void setup() {
+    Serial.begin(9600);
+    Serial.println(FOO);
+}
+
+void loop() {
+}

internal/integrationtest/testdata/sketch_with_single_string_define/sketch_with_single_string_define.ino

@@ -0,0 +1,10 @@
+
+const String FOO = MY_DEFINE;
+
+void setup() {
+    Serial.begin(9600);
+    Serial.println(FOO);
+}
+
+void loop() {
+}

test/test_compile_part_1.py

@@ -60,81 +60,6 @@ def test_compile_without_precompiled_libraries(run_command, data_dir):
     assert run_command(["compile", "-b", "arduino:samd:mkrvidor4000", sketch_path])
 
 
-def test_compile_with_build_properties_flag(run_command, data_dir, copy_sketch):
-    # Init the environment explicitly
-    assert run_command(["core", "update-index"])
-
-    # Install Arduino AVR Boards
-    assert run_command(["core", "install", "arduino:avr@1.8.3"])
-
-    sketch_path = copy_sketch("sketch_with_single_string_define")
-    fqbn = "arduino:avr:uno"
-
-    # Compile using a build property with quotes
-    res = run_command(
-        [
-            "compile",
-            "-b",
-            fqbn,
-            '--build-properties="build.extra_flags=\\"-DMY_DEFINE=\\"hello world\\"\\""',
-            sketch_path,
-            "--verbose",
-            "--clean",
-        ]
-    )
-    assert res.failed
-    assert "Flag --build-properties has been deprecated, please use --build-property instead." not in res.stderr
-
-    # Try again with quotes
-    res = run_command(
-        [
-            "compile",
-            "-b",
-            fqbn,
-            '--build-properties="build.extra_flags=-DMY_DEFINE=\\"hello\\""',
-            sketch_path,
-            "--verbose",
-            "--clean",
-        ]
-    )
-    assert res.failed
-    assert "Flag --build-properties has been deprecated, please use --build-property instead." not in res.stderr
-
-    # Try without quotes
-    sketch_path = copy_sketch("sketch_with_single_int_define")
-    res = run_command(
-        [
-            "compile",
-            "-b",
-            fqbn,
-            '--build-properties="build.extra_flags=-DMY_DEFINE=1"',
-            sketch_path,
-            "--verbose",
-            "--clean",
-        ]
-    )
-    assert res.ok
-    assert "Flag --build-properties has been deprecated, please use --build-property instead." in res.stderr
-    assert "-DMY_DEFINE=1" in res.stdout
-
-    sketch_path = copy_sketch("sketch_with_multiple_int_defines")
-    res = run_command(
-        [
-            "compile",
-            "-b",
-            fqbn,
-            '--build-properties="build.extra_flags=-DFIRST_PIN=1,compiler.cpp.extra_flags=-DSECOND_PIN=2"',
-            sketch_path,
-            "--verbose",
-            "--clean",
-        ]
-    )
-    assert res.ok
-    assert "Flag --build-properties has been deprecated, please use --build-property instead." in res.stderr
-    assert "-DFIRST_PIN=1" in res.stdout
-    assert "-DSECOND_PIN=2" in res.stdout
-
-
 def test_compile_with_build_property_containing_quotes(run_command, data_dir, copy_sketch):
     # Init the environment explicitly
     assert run_command(["core", "update-index"])