Merge branch 'master' into master-typref-38717

ballerina-platform · Apr 28, 2023 · e7d20df · e7d20df
2 parents 1bd6fa9 + 2630f80
commit e7d20df
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 27 deletions.
diff --git a/...s/testerina-integration-test/src/test/java/org/ballerinalang/testerina/test/MockTest.java b/...s/testerina-integration-test/src/test/java/org/ballerinalang/testerina/test/MockTest.java
@@ -190,10 +190,10 @@ public void testObjectMocking_NonPublicField() throws BallerinaTestException, IO
         String output =
                 balClient.runMainAndReadStdOut("test", args, new HashMap<>(),
                         projectBasedTestsPath.resolve("non-public-field-mock").toString(), false);
-        String firstString = "Generating Test Report\n\t";
+        String firstString = "Generating Test Report";
         String endString = "project-based-tests";
         output = CommonUtils.replaceVaryingString(firstString, endString, output);
-        AssertionUtils.assertOutput("MockTest-testObjectMocking_NegativeCases8.txt", output);
+        AssertionUtils.assertOutput("MockTest-testObjectMocking_NonPublicField.txt", output);
     }
 
     @DataProvider(name = "testNegativeCases")

diff --git a/...est/src/test/resources/command-outputs/unix/MockTest-testObjectMocking_NegativeCases8.txt b/...est/src/test/resources/command-outputs/unix/MockTest-testObjectMocking_NegativeCases8.txt
diff --git a/...est/src/test/resources/command-outputs/unix/MockTest-testObjectMocking_NonPublicField.txt b/...est/src/test/resources/command-outputs/unix/MockTest-testObjectMocking_NonPublicField.txt
@@ -0,0 +1,24 @@
+Compiling source
+	intg_tests/non_public_field_mock:0.0.0
+
+Running Tests with Coverage
+
+	non_public_field_mock
+
+		[fail] testNonPublicMemberFieldMock:
+
+		    error("NonPublicMemberFieldError",message="member field should be public to be mocked. The provided field 'url' is not public")
+				callableName: thenReturnExt moduleName: ballerina.test.0 fileName: mock.bal lineNumber: 355
+				callableName: thenReturn moduleName: ballerina.test.0.MemberVariableStub fileName: mock.bal lineNumber: 212
+				callableName: testNonPublicMemberFieldMock moduleName: intg_tests.non_public_field_mock$test.0.tests.main_error_test fileName: tests/main_error_test.bal lineNumber: 23
+				callableName: testNonPublicMemberFieldMock$lambda0$ moduleName: intg_tests.non_public_field_mock$test.0.tests.test_execute-generated_1 fileName: tests/test_execute-generated_1.bal lineNumber: 3
+
+
+
+		0 passing
+		1 failing
+		0 skipped
+
+Generating Test Report*****project-based-tests/non-public-field-mock/target/report/test_results.json
+
+error: there are test failures
diff --git a/.../src/test/resources/command-outputs/windows/MockTest-testObjectMocking_NegativeCases8.txt b/.../src/test/resources/command-outputs/windows/MockTest-testObjectMocking_NegativeCases8.txt
diff --git a/.../src/test/resources/command-outputs/windows/MockTest-testObjectMocking_NonPublicField.txt b/.../src/test/resources/command-outputs/windows/MockTest-testObjectMocking_NonPublicField.txt
@@ -0,0 +1,24 @@
+Compiling source
+	intg_tests/non_public_field_mock:0.0.0
+
+Running Tests with Coverage
+
+	non_public_field_mock
+
+		[fail] testNonPublicMemberFieldMock:
+
+		    error("NonPublicMemberFieldError",message="member field should be public to be mocked. The provided field 'url' is not public")
+				callableName: thenReturnExt moduleName: ballerina.test.0 fileName: mock.bal lineNumber: 355
+				callableName: thenReturn moduleName: ballerina.test.0.MemberVariableStub fileName: mock.bal lineNumber: 212
+				callableName: testNonPublicMemberFieldMock moduleName: intg_tests.non_public_field_mock$test.0.tests.main_error_test fileName: tests/main_error_test.bal lineNumber: 23
+				callableName: testNonPublicMemberFieldMock$lambda0$ moduleName: intg_tests.non_public_field_mock$test.0.tests.test_execute-generated_1 fileName: tests/test_execute-generated_1.bal lineNumber: 3
+
+
+
+		0 passing
+		1 failing
+		0 skipped
+
+Generating Test Report*****project-based-tests\non-public-field-mock\target\report\test_results.json
+
+error: there are test failures