From f7376355cf642d701170e00a1eaf4953500b9005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Coll=20Morag=C3=B3n?= Date: Fri, 23 Feb 2024 11:37:19 +0000 Subject: [PATCH] storage: Fix ClassRule execution order in HadoopVariantStorageSearchIntersectTest #TASK-5663 --- .../core/variant/VariantStorageSearchIntersectTest.java | 2 +- .../variant/HadoopVariantStorageSearchIntersectTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opencga-storage/opencga-storage-core/src/test/java/org/opencb/opencga/storage/core/variant/VariantStorageSearchIntersectTest.java b/opencga-storage/opencga-storage-core/src/test/java/org/opencb/opencga/storage/core/variant/VariantStorageSearchIntersectTest.java index 37c1c02b60d..5e29cd2b127 100644 --- a/opencga-storage/opencga-storage-core/src/test/java/org/opencb/opencga/storage/core/variant/VariantStorageSearchIntersectTest.java +++ b/opencga-storage/opencga-storage-core/src/test/java/org/opencb/opencga/storage/core/variant/VariantStorageSearchIntersectTest.java @@ -65,7 +65,7 @@ @Ignore public abstract class VariantStorageSearchIntersectTest extends VariantStorageBaseTest { - @ClassRule + @ClassRule(order = 10) public static VariantSolrExternalResource solr = new VariantSolrExternalResource(); protected VariantDBAdaptor dbAdaptor; diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/src/test/java/org/opencb/opencga/storage/hadoop/variant/HadoopVariantStorageSearchIntersectTest.java b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/src/test/java/org/opencb/opencga/storage/hadoop/variant/HadoopVariantStorageSearchIntersectTest.java index f73ad2af141..e8987078bc8 100644 --- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/src/test/java/org/opencb/opencga/storage/hadoop/variant/HadoopVariantStorageSearchIntersectTest.java +++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/src/test/java/org/opencb/opencga/storage/hadoop/variant/HadoopVariantStorageSearchIntersectTest.java @@ -33,10 +33,10 @@ @Category(LongTests.class) public class HadoopVariantStorageSearchIntersectTest extends VariantStorageSearchIntersectTest implements HadoopVariantStorageTest { - @ClassRule(order = 0) + @ClassRule(order = 1) public static HadoopSolrSupport solrSupport = new HadoopSolrSupport(); - @ClassRule(order = 1) + @ClassRule(order = 20) public static ExternalResource externalResource = new HadoopExternalResource(); @Override