mirror of
https://github.com/SAP/jenkins-library.git
synced 2024-12-14 11:03:09 +02:00
Merge branch 'master' into pr/cleanWorktreeCheck
This commit is contained in:
commit
bce7f370de
@ -1,12 +1,9 @@
|
|||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.BeforeClass
|
|
||||||
import org.junit.ClassRule
|
|
||||||
import org.junit.Ignore
|
import org.junit.Ignore
|
||||||
import org.junit.Rule
|
import org.junit.Rule
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
import org.junit.rules.ExpectedException
|
import org.junit.rules.ExpectedException
|
||||||
import org.junit.rules.RuleChain
|
import org.junit.rules.RuleChain
|
||||||
import org.junit.rules.TemporaryFolder
|
|
||||||
import org.yaml.snakeyaml.parser.ParserException
|
import org.yaml.snakeyaml.parser.ParserException
|
||||||
|
|
||||||
import hudson.AbortException
|
import hudson.AbortException
|
||||||
@ -23,9 +20,6 @@ public class MtaBuildTest extends BasePiperTest {
|
|||||||
def toolMtaValidateCalled = false
|
def toolMtaValidateCalled = false
|
||||||
def toolJavaValidateCalled = false
|
def toolJavaValidateCalled = false
|
||||||
|
|
||||||
@ClassRule
|
|
||||||
public static TemporaryFolder tmp = new TemporaryFolder()
|
|
||||||
|
|
||||||
private ExpectedException thrown = new ExpectedException()
|
private ExpectedException thrown = new ExpectedException()
|
||||||
private JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
|
private JenkinsLoggingRule jlr = new JenkinsLoggingRule(this)
|
||||||
private JenkinsShellCallRule jscr = new JenkinsShellCallRule(this)
|
private JenkinsShellCallRule jscr = new JenkinsShellCallRule(this)
|
||||||
@ -43,11 +37,6 @@ public class MtaBuildTest extends BasePiperTest {
|
|||||||
.around(jder)
|
.around(jder)
|
||||||
.around(jsr)
|
.around(jsr)
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
static void createTestFiles() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
void init() {
|
void init() {
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user