Skip to content

Commit

Permalink
- Added 'COMP' on certain fields in CCHECKWS.CPY
Browse files Browse the repository at this point in the history 
- Fixed bug, where END-MOCK keywords would be parsed as cobol-token
- Added tests for TestSuiteErrorLogTest

Signed-off-by: David Kaan <dak@bankdata.dk>
  • Loading branch information
David Kaan committed May 3, 2022
1 parent 224e592 commit f1b944a
Show file tree
Hide file tree
Showing 13 changed files with 177 additions and 98 deletions.
98 changes: 49 additions & 49 deletions CC##99.CBL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
05 UT-TEST-CASE-NAME PIC X(80) VALUE SPACES.
05 UT-TEST-CASE-NUMBER PIC ZZ9.
05 UT-RETCODE PIC 9(4) VALUE ZERO.
05 UT-TEST-CASE-COUNT PIC 9(4) VALUE ZERO.
05 UT-NUMBER-PASSED PIC 9(4) VALUE ZERO.
05 UT-NUMBER-FAILED PIC 9(4) VALUE ZERO.
05 UT-TEST-CASE-COUNT PIC 9(4) VALUE ZERO COMP.
05 UT-NUMBER-PASSED PIC 9(4) VALUE ZERO COMP.
05 UT-NUMBER-FAILED PIC 9(4) VALUE ZERO COMP.
05 UT-EXPECTED-TRIM PIC S9(5) COMP-3 VALUE ZERO.
05 UT-ACTUAL-TRIM PIC S9(5) COMP-3 VALUE ZERO.
01 UT-MOCKS.
Expand Down Expand Up @@ -140,96 +140,96 @@
05 TEMP PIC X(80).

01 UT-MOCKS-GENERATED.
05 UT-2-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-0-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-2-0-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-0-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-0-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-0-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-0-2-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
05 UT-2-2-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-2-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-2-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-2-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-2-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-2-2-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-2-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-2-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-2-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-2-2-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
05 UT-2-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-3-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-2-3-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-3-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-3-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-3-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-3-2-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
05 UT-2-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-4-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-2-4-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-2-4-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-2-4-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-2-4-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-2-4-2-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
05 UT-5-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-0-1-MOCK-NAME PIC X(40)
VALUE "CALL 'PROG1'".
05 UT-5-1-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-1-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-1-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-1-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-1-1-MOCK-NAME PIC X(40)
VALUE "CALL 'PROG1'".
05 UT-5-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-3-1-MOCK-NAME PIC X(40)
VALUE "CALL VALUE-2".
05 UT-5-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-4-1-MOCK-NAME PIC X(40)
VALUE "CALL 'PROG3'".
05 UT-5-5-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-5-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-5-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-5-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-5-1-MOCK-NAME PIC X(40)
VALUE "CALL 'PROG3'".
05 UT-5-5-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-5-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-5-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-5-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-5-2-MOCK-NAME PIC X(40)
VALUE "PARAGRAPH 800-MAKE-CALL".
05 UT-5-6-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-5-6-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-5-6-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-5-6-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-5-6-1-MOCK-NAME PIC X(40)
VALUE "CALL 'PROG1'".
05 UT-6-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-0-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-0-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-0-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-6-0-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-0-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-0-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-0-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-0-2-MOCK-NAME PIC X(40)
VALUE "PARAGRAPH 300-CHANGE-1".
05 UT-6-2-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-2-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-2-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-2-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-2-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-6-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-3-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-1-MOCK-NAME PIC X(40)
VALUE "SECTION 000-START".
05 UT-6-3-2-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-3-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-3-2-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-2-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-2-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
05 UT-6-3-3-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-3-3-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-3-3-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-3-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-3-3-MOCK-NAME PIC X(40)
VALUE "PARAGRAPH 500-SWITCH".
05 UT-6-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-4-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-4-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-4-1-MOCK-NAME PIC X(40)
VALUE "PARAGRAPH 500-SWITCH".
05 UT-6-5-1-MOCK-COUNT PIC 9(02) VALUE ZERO.
05 UT-6-5-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO.
05 UT-6-5-1-MOCK-COUNT PIC 9(02) VALUE ZERO COMP.
05 UT-6-5-1-MOCK-EXPECTED PIC 9(02) VALUE ZERO COMP.
05 UT-6-5-1-MOCK-NAME PIC X(40)
VALUE "SECTION 100-WELCOME".
PROCEDURE DIVISION.
Expand Down
6 changes: 3 additions & 3 deletions copybooks/CCHECKWS.CPY
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
05 ==UT==TEST-CASE-NAME PIC X(80) VALUE SPACES.
05 ==UT==TEST-CASE-NUMBER PIC ZZ9.
05 ==UT==RETCODE PIC 9(4) VALUE ZERO.
05 ==UT==TEST-CASE-COUNT PIC 9(4) VALUE ZERO.
05 ==UT==NUMBER-PASSED PIC 9(4) VALUE ZERO.
05 ==UT==NUMBER-FAILED PIC 9(4) VALUE ZERO.
05 ==UT==TEST-CASE-COUNT PIC 9(4) VALUE ZERO COMP.
05 ==UT==NUMBER-PASSED PIC 9(4) VALUE ZERO COMP.
05 ==UT==NUMBER-FAILED PIC 9(4) VALUE ZERO COMP.
05 ==UT==EXPECTED-TRIM PIC S9(5) COMP-3 VALUE ZERO.
05 ==UT==ACTUAL-TRIM PIC S9(5) COMP-3 VALUE ZERO.
01 ==UT==MOCKS.
Expand Down
20 changes: 18 additions & 2 deletions src/main/java/org/openmainframeproject/cobolcheck/features/testSuiteParser/Keywords.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ public class Keywords {
Constants.BY_REFERENCE_TOKEN,
Constants.BY_CONTENT_TOKEN,
Constants.BY_VALUE_TOKEN,
Constants.PARENTHESIS_ENCLOSED_KEYWORD),
Constants.PARENTHESIS_ENCLOSED_KEYWORD,
Constants.ENDMOCK_KEYWORD),
KeywordAction.FIELDNAME));
keywordInfo.put(Constants.NOT_KEYWORD,
new Keyword(Constants.NOT_KEYWORD,
Expand Down Expand Up @@ -169,7 +170,8 @@ public class Keywords {
Constants.AFTER_EACH_TOKEN_HYPHEN,
Constants.HAPPENED_KEYWORD,
Constants.NEVER_HAPPENED_KEYWORD,
Constants.USING_TOKEN),
Constants.USING_TOKEN,
Constants.ENDMOCK_KEYWORD),
KeywordAction.FIELDNAME));
keywordInfo.put(Constants.NUMERIC_LITERAL_KEYWORD,
new Keyword(Constants.NUMERIC_LITERAL_KEYWORD,
Expand All @@ -193,6 +195,7 @@ public class Keywords {
Constants.TESTSUITE_KEYWORD,
Constants.TESTCASE_KEYWORD,
Constants.MOCK_KEYWORD,
Constants.ENDMOCK_KEYWORD,
Constants.VERIFY_KEYWORD,
Constants.PARENTHESIS_ENCLOSED_KEYWORD),
KeywordAction.COBOL_STATEMENT));
Expand Down Expand Up @@ -243,6 +246,19 @@ public class Keywords {
new Keyword(Constants.MOCK_KEYWORD,
Arrays.asList(Constants.MOCK_TYPE),
KeywordAction.NONE));
keywordInfo.put(Constants.ENDMOCK_KEYWORD,
new Keyword(Constants.ENDMOCK_KEYWORD,
Arrays.asList(Constants.COBOL_TOKEN,
Constants.BEFORE_EACH_TOKEN,
Constants.BEFORE_EACH_TOKEN_HYPHEN,
Constants.AFTER_EACH_TOKEN,
Constants.AFTER_EACH_TOKEN_HYPHEN,
Constants.TESTSUITE_KEYWORD,
Constants.TESTCASE_KEYWORD,
Constants.MOCK_KEYWORD,
Constants.VERIFY_KEYWORD,
Constants.EXPECT_KEYWORD),
KeywordAction.NONE));

keywordInfo.put(Constants.MOCK_TYPE,
new Keyword(Constants.MOCK_TYPE,
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/openmainframeproject/cobolcheck/features/testSuiteParser/MockGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ String getEndEvaluateLine() {
private List<String> generateMockCountValues(List<Mock> mocks) {
List<String> lines = new ArrayList<>();
for (Mock mock : mocks){
lines.add(" 05 " + mock.getGeneratedMockCountIdentifier() + " PIC 9(02) VALUE ZERO.");
lines.add(" 05 " + mock.getGeneratedMockCountExpectedIdentifier() + " PIC 9(02) VALUE ZERO.");
lines.add(" 05 " + mock.getGeneratedMockCountIdentifier() + " PIC 9(02) VALUE ZERO COMP.");
lines.add(" 05 " + mock.getGeneratedMockCountExpectedIdentifier() + " PIC 9(02) VALUE ZERO COMP.");
lines.add(" 05 " + mock.getGeneratedMockStringIdentifierName() + " PIC X(40)");
lines.add(" VALUE \"" + mock.getMockDisplayString() + "\".");
}
Expand Down
2 changes: 2 additions & 0 deletions .../java/org/openmainframeproject/cobolcheck/features/testSuiteParser/TestSuiteErrorLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public boolean hasErrorOccured() {

public String getLastErrorMessage(){ return lastErrorLogMessage; }

public String getLastKeywordValue() { return lastKeyword.value(); }

public void checkExpectedTokenSyntax(Keyword currentKeyword, String currentFile, int lineNumber, int lineIndex){
if (lastKeyword != null){
String error = "";
Expand Down
4 changes: 3 additions & 1 deletion ...in/java/org/openmainframeproject/cobolcheck/features/testSuiteParser/TestSuiteParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,10 @@ public List<String> getParsedTestSuiteLines(BufferedReader testSuiteReader,
testSuiteToken = testSuiteToken.toUpperCase(Locale.ROOT);
}

if (Constants.IGNORED_TOKENS.contains(testSuiteToken))
if (Constants.IGNORED_TOKENS.contains(testSuiteToken)){
testSuiteToken = getNextTokenFromTestSuite(testSuiteReader);
continue;
}

boolean cobolTokenIsFieldName = (expectInProgress || expectQualifiedName || expectMockIdentifier || (expectMockArguments && !expectUsing));
Keyword keyword = Keywords.getKeywordFor(testSuiteToken, cobolTokenIsFieldName);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/openmainframeproject/cobolcheck/services/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private Constants() {
public static final String BEFORE_EACH_TOKEN_HYPHEN = "BEFORE-EACH";
public static final String AFTER_EACH_TOKEN_HYPHEN = "AFTER-EACH";
public static final String PARA_TOKEN = "PARA";
public static final List<String> IGNORED_TOKENS = Arrays.asList("END-CALL");
public static final List<String> IGNORED_TOKENS = Arrays.asList("END-CALL", "END-MOCK");

// Configuration key values
public static final String CONCATENATED_TEST_SUITES_CONFIG_KEY = "concatenated.test.suites";
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/org/openmainframeproject/cobolcheck/copybooks/CCHECKWS.CPY
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
05 ==UT==TEST-CASE-NAME PIC X(80) VALUE SPACES.
05 ==UT==TEST-CASE-NUMBER PIC ZZ9.
05 ==UT==RETCODE PIC 9(4) VALUE ZERO.
05 ==UT==TEST-CASE-COUNT PIC 9(4) VALUE ZERO.
05 ==UT==NUMBER-PASSED PIC 9(4) VALUE ZERO.
05 ==UT==NUMBER-FAILED PIC 9(4) VALUE ZERO.
05 ==UT==TEST-CASE-COUNT PIC 9(4) VALUE ZERO COMP.
05 ==UT==NUMBER-PASSED PIC 9(4) VALUE ZERO COMP.
05 ==UT==NUMBER-FAILED PIC 9(4) VALUE ZERO COMP.
05 ==UT==EXPECTED-TRIM PIC S9(5) COMP-3 VALUE ZERO.
05 ==UT==ACTUAL-TRIM PIC S9(5) COMP-3 VALUE ZERO.
01 ==UT==MOCKS.
Expand Down
Loading

0 comments on commit f1b944a

Please sign in to comment.