Changeset 7865

Timestamp:

Oct 21, 2020, 8:26:50 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2224: Files should be annotatable

Need to ignore missing files when testing the "Item overview" since we never set files for protocols.

File:

• branches/3.17-stable/src/test/net/sf/basedb/test/roles/AnalysisTest.java (modified) (2 diffs)

branches/3.17-stable/src/test/net/sf/basedb/test/roles/AnalysisTest.java

@@ -48 +48 @@
 import net.sf.basedb.util.overview.Validator;
 import net.sf.basedb.util.overview.Failure;
-import net.sf.basedb.util.overview.extensions.ValidationRuleAction;
 
 /**
@@ -82 +81 @@
       
       ValidationOptions options = new ValidationOptions();
-      // Expected, since we never specified a biosource for the reference sample and never kit for any item
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_BIOSOURCE, Severity.IGNORE);
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_KIT, Severity.IGNORE);
+      // Expected, since we never specified a biosource for the reference sample and never kit for any item or files for protocols
+      options.setSeverity(Validator.MISSING_BIOSOURCE, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_KIT, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_FILE, Severity.IGNORE);
       GenericOverview overview = getExperimentOverview(dc, experiment, 
         activeProject, options, 0);
       
       // Expected, since the Affymetrix experiment is using a different raw data type
-      options.setSeverity((ValidationRuleAction)Validator.NONDEFAULT_RAWDATATYPE, Severity.IGNORE);
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_HARDWARE, Severity.IGNORE);
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_PROTOCOL, Severity.IGNORE);
-      options.setSeverity((ValidationRuleAction)Validator.NONMATCHING_SPOTCOUNT, Severity.IGNORE);
+      options.setSeverity(Validator.NONDEFAULT_RAWDATATYPE, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_HARDWARE, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_PROTOCOL, Severity.IGNORE);
+      options.setSeverity(Validator.NONMATCHING_SPOTCOUNT, Severity.IGNORE);
       GenericOverview affyOverview = getExperimentOverview(dc, affyExperiment, 
         activeProject, options, 2);
       
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_ARRAYSLIDE, Severity.IGNORE);
-      options.setSeverity((ValidationRuleAction)Validator.MISSING_TAG, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_ARRAYSLIDE, Severity.IGNORE);
+      options.setSeverity(Validator.MISSING_TAG, Severity.IGNORE);
       // Sequence experiment overview
       GenericOverview seqOverview = getExperimentOverview(dc, seqExperiment,