Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15448: fixed test failures

Noble Paul5f138186e146
diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
index 5dd9f55aee9..3a01c1b38db 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
@@ -179,6 +179,9 @@ public class PackageAPI {
public static class PkgVersion implements ReflectMapWriter {
+ @JsonProperty("package")
+ public String pkg;
+
@JsonProperty
public String version;
@@ -195,6 +198,7 @@ public class PackageAPI {
}
public PkgVersion(Package.AddVersion addVersion) {
+ this.pkg = addVersion.pkg;
this.version = addVersion.version;
this.files = addVersion.files == null? null : Collections.unmodifiableList(addVersion.files);
this.manifest = addVersion.manifest;
@@ -228,6 +232,7 @@ public class PackageAPI {
public PkgVersion copy() {
PkgVersion result = new PkgVersion();
+ result.pkg = this.pkg;
result.version = this.version;
result.files = this.files;
result.manifest = this.manifest;
diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
index afbf7df9b53..651ebfe171e 100644
--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java
@@ -113,7 +113,6 @@ public class TestPackages extends SolrCloudTestCase {
}
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15448")
@Test
public void testCoreReloadingPlugin() throws Exception {
String FILE1 = "/mypkg/runtimelibs.jar";
@@ -168,7 +167,6 @@ public class TestPackages extends SolrCloudTestCase {
"mypkg", "2.0" );
}
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15448")
@Test
public void testPluginLoading() throws Exception {
String FILE1 = "/mypkg/runtimelibs.jar";
@@ -296,8 +294,7 @@ public class TestPackages extends SolrCloudTestCase {
executeReq( "/" + COLLECTION_NAME + "/get?wt=json", cluster.getRandomJetty(random()),
Utils.JSONCONSUMER,
- Map.of("class", "org.apache.solr.core.RuntimeLibSearchComponent",
- "Version","1"));
+ Map.of("Version","1"));
executeReq( "/" + COLLECTION_NAME + "/runtime?wt=json1", cluster.getRandomJetty(random()),
@@ -690,7 +687,6 @@ public class TestPackages extends SolrCloudTestCase {
}
}
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-15448")
@Test
public void testSchemaPlugins() throws Exception {
String COLLECTION_NAME = "testSchemaLoadingColl";
@@ -752,8 +748,8 @@ public class TestPackages extends SolrCloudTestCase {
withMethod(SolrRequest.METHOD.GET)
.build().process(cluster.getSolrClient()),
Map.of(
- ":result:packages:schemapkg[0]:version", "2.0",
- ":result:packages:schemapkg[0]:files[0]", FILE1
+ ":result:packages:schemapkg[1]:version", "2.0",
+ ":result:packages:schemapkg[1]:files[0]", FILE1
));
verifySchemaComponent(cluster.getSolrClient(), COLLECTION_NAME, "/schema/fieldtypes/myNewTextFieldWithAnalyzerClass",