Skip to content

Commit

Permalink
fix(java-junit): parse StackTraceElement with custom classloader
Browse files Browse the repository at this point in the history
Fixes dorny#208
  • Loading branch information
atsu85 committed Nov 19, 2022
1 parent 3a48f6e commit aebbb4d
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 8 deletions.
34 changes: 30 additions & 4 deletions __tests__/java-stack-trace-element-parser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,37 @@ describe('parseStackTraceLine tests', () => {
})

it('starts with whitespaces', async () => {
const line = " \tat org.apache.pulsar.AddMissingPatchVersionTest.testVersionStrings(AddMissingPatchVersionTest.java:29)"
const line =
' \tat org.apache.pulsar.AddMissingPatchVersionTest.testVersionStrings(AddMissingPatchVersionTest.java:29)'
expect(parseStackTraceElement(line)).toEqual({
tracePath: "org.apache.pulsar.AddMissingPatchVersionTest.testVersionStrings",
fileName: "AddMissingPatchVersionTest.java",
lineStr: "29"
tracePath: 'org.apache.pulsar.AddMissingPatchVersionTest.testVersionStrings',
fileName: 'AddMissingPatchVersionTest.java',
lineStr: '29'
})
})

describe('since Java 9', () => {
it('with classloader and module', async () => {
// Based on Java 9 StackTraceElement.toString() Doc: https://docs.oracle.com/javase/9/docs/api/java/lang/StackTraceElement.html#toString--
const line = 'at com.foo.loader/[email protected]/com.foo.Main.run(Main.java:101)'
expect(parseStackTraceElement(line)).toEqual({
classLoader: 'com.foo.loader',
moduleNameAndVersion: '[email protected]',
tracePath: 'com.foo.Main.run',
fileName: 'Main.java',
lineStr: '101'
})
})

it('with classloader', async () => {
const line = 'at com.foo.loader//com.foo.Main.run(Main.java:101)'
expect(parseStackTraceElement(line)).toEqual({
classLoader: 'com.foo.loader',
moduleNameAndVersion: undefined,
tracePath: 'com.foo.Main.run',
fileName: 'Main.java',
lineStr: '101'
})
})
})
})
Expand Down
30 changes: 26 additions & 4 deletions src/parsers/java-junit/java-stack-trace-element-parser.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,44 @@
export interface StackTraceElement {
classLoader: string | undefined
moduleNameAndVersion: string | undefined
tracePath: string
fileName: string
lineStr: string
}

// simple format:
// at <FULLY_QUALIFIED_METHOD_NAME>(<FILE_NAME>:<LINE_NUMBER>)
const re = /^\s*at (.*)\((.*):(\d+)\)$/
// classloader and module name are optional:
// at <CLASSLOADER>/<MODULE_NAME_AND_VERSION>/<FULLY_QUALIFIED_METHOD_NAME>(<FILE_NAME>:<LINE_NUMBER>)
// https://github.com/eclipse-openj9/openj9/issues/11452#issuecomment-754946992
const re = /^\s*at (\S+\/\S*\/)?(.*)\((.*):(\d+)\)$/

export function parseStackTraceElement(stackTraceLine: string): StackTraceElement | undefined {
const match = stackTraceLine.match(re)
if (match !== null) {
const [_, tracePath, fileName, lineStr] = match
const [_, maybeClassLoaderAndModuleNameAndVersion, tracePath, fileName, lineStr] = match
const {classLoader, moduleNameAndVersion} = parseClassLoaderAndModule(maybeClassLoaderAndModuleNameAndVersion)
return {
classLoader,
moduleNameAndVersion,
tracePath,
fileName,
lineStr
}
}
return undefined
}

function parseClassLoaderAndModule(maybeClassLoaderAndModuleNameAndVersion?: string): {
classLoader?: string
moduleNameAndVersion?: string
} {
if (maybeClassLoaderAndModuleNameAndVersion) {
const res = maybeClassLoaderAndModuleNameAndVersion.split('/')
const classLoader = res[0]
let moduleNameAndVersion: string | undefined = res[1]
if (moduleNameAndVersion === '') {
moduleNameAndVersion = undefined
}
return {classLoader, moduleNameAndVersion}
}
return {classLoader: undefined, moduleNameAndVersion: undefined}
}

0 comments on commit aebbb4d

Please sign in to comment.