Skip to content

Commit

Permalink
Use junit 4 assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
reinsch82 committed Sep 27, 2023
1 parent a509875 commit 0a5abed
Showing 1 changed file with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package org.eclipse.buildship.core.internal.workspace
import org.eclipse.buildship.core.internal.CompatibilityChecker
import org.eclipse.buildship.core.internal.operation.ToolingApiStatus
import org.gradle.api.JavaVersion
import org.junit.Assert
import org.junit.jupiter.api.Assertions;
import spock.lang.Ignore
import spock.lang.IgnoreIf
import spock.lang.Unroll
Expand Down Expand Up @@ -139,12 +139,12 @@ class ImportingProjectCrossVersionTest extends ProjectSynchronizationSpecificati

then:
if (importResult.status.isOK()) {
Assert.assertEquals(allProjects().size(), 1)
Assert.assertEquals(numOfGradleErrorMarkers, 0)
Assert.assertEquals(getPlatformLogErrors().size(), 0)
Assertions.assertEquals(allProjects().size(), 1)
Assertions.assertEquals(numOfGradleErrorMarkers, 0)
Assertions.assertEquals(getPlatformLogErrors().size(), 0)
} else {
Assert.assertTrue(importResult.status instanceof ToolingApiStatus)
Assert.assertNotEquals(importResult.status.getCode(), ToolingApiStatus.ToolingApiStatusType.INCOMPATIBILITY_JAVA.ordinal())
Assertions.assertTrue(importResult.status instanceof ToolingApiStatus)
Assertions.assertNotEquals(importResult.status.getCode(), ToolingApiStatus.ToolingApiStatusType.INCOMPATIBILITY_JAVA.ordinal())
}

cleanup:
Expand All @@ -161,12 +161,12 @@ class ImportingProjectCrossVersionTest extends ProjectSynchronizationSpecificati

then:
if (importResult.status.isOK()) {
Assert.assertEquals(allProjects().size(), 1)
Assert.assertEquals(numOfGradleErrorMarkers, 0)
Assert.assertEquals(getPlatformLogErrors().size(), 0)
Assertions.assertEquals(allProjects().size(), 1)
Assertions.assertEquals(numOfGradleErrorMarkers, 0)
Assertions.assertEquals(getPlatformLogErrors().size(), 0)
} else {
Assert.assertTrue(importResult.status instanceof ToolingApiStatus)
Assert.assertEquals(importResult.status.getCode(), ToolingApiStatus.ToolingApiStatusType.INCOMPATIBILITY_JAVA.ordinal())
Assertions.assertTrue(importResult.status instanceof ToolingApiStatus)
Assertions.assertEquals(importResult.status.getCode(), ToolingApiStatus.ToolingApiStatusType.INCOMPATIBILITY_JAVA.ordinal())
}

where:
Expand Down

0 comments on commit 0a5abed

Please sign in to comment.