Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15619: three trivial test tweaks

Christine Poerschkeaa5d93d60256
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java b/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
index 23bea78cf25..baaef7b1114 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrJacksonAnnotation.java
@@ -65,7 +65,9 @@ public class TestSolrJacksonAnnotation extends SolrTestCase {
assertTrue(errs.get(0).contains("Missing required attribute"));
m.put("friendlyIntFld", Boolean.TRUE);
errs = validator.validateJson(m);
+ assertTrue(errs.get(0).contains("Value is not valid"));
m.put("friendlyIntFld", "another String");
+ errs = validator.validateJson(m);
assertTrue(errs.get(0).contains("Value is not valid"));
}
diff --git a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
index 5f7c2c7f0e0..3ab121e467b 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
@@ -85,7 +85,7 @@ public class JsonValidatorTest extends SolrTestCaseJ4 {
" adult : {type: Boolean}," +
" name: {type: string}}}");
});
- assertTrue(e.getMessage().contains("Unknown type"));
+ assertTrue(e.getMessage().contains("Unknown type int"));
e = expectThrows(Exception.class, () -> {
new JsonSchemaValidator("{" +