[no ticket][risk=no] fixing BQ test cases (#5299)

* fixing BQ test cases * removing bad tests * codacy fix * updating gradle * removing formatting changes * adding @disabled * adding @disabled on class level * adding @disabled on test that had @ignore
all-of-us · Jul 26, 2021 · 2c3c3dd · 2c3c3dd
1 parent c63d859
commit 2c3c3dd
Show file tree

Hide file tree

Showing 7 changed files with 2,065 additions and 870 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -531,6 +531,8 @@ task integrationTest(type: Test) {
   // These tests should always run when requested since they consume and produce side-effects.
   outputs.upToDateWhen { false }
 
+  useJUnitPlatform()
+
   // Option to control size of stack trace:
   // jvmArgs '-XX:MaxJavaStackTraceDepth=10'
 }
@@ -542,6 +544,8 @@ task bigQueryTest(type: Test) {
   classpath = sourceSets.__bigQueryTest__.runtimeClasspath
 
   outputs.upToDateWhen { false }
+
+  useJUnitPlatform()
 }
 
 tasks.withType(Test) {

diff --git a/api/src/bigquerytest/java/org/pmiops/workbench/api/BigQueryBaseTest.java b/api/src/bigquerytest/java/org/pmiops/workbench/api/BigQueryBaseTest.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.TestInstance;
 import org.pmiops.workbench.SpringTest;
 import org.pmiops.workbench.testconfig.TestBigQueryConfig;
 import org.pmiops.workbench.testconfig.TestWorkbenchConfig;
@@ -31,6 +32,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @SpringBootTest(classes = {TestBigQueryConfig.class, WorkbenchConfigConfig.class})
 @TestPropertySource(properties = "spring.main.allow-bean-definition-overriding=true")
 public abstract class BigQueryBaseTest extends SpringTest {