[camel] branch master updated: CAMEL-14715: Fixed catalog tests

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new d60be35  CAMEL-14715: Fixed catalog tests
d60be35 is described below

commit d60be35d493aaf15d4d6bd3461e55e73fce62e18
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Mar 28 09:03:20 2020 +0100

    CAMEL-14715: Fixed catalog tests
---
 .../src/main/java/org/apache/camel/catalog/CamelCatalog.java       | 7 -------
 .../main/java/org/apache/camel/catalog/DefaultCamelCatalog.java    | 5 -----
 .../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java   | 7 ++-----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 4e40f5b..8f566dc 100644
--- 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++ 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -369,13 +369,6 @@ public interface CamelCatalog {
     String springSchemaAsXml();
 
     /**
-     * Returns the Camel Blueprint XML schema
-     *
-     * @return the blueprint XML schema
-     */
-    String blueprintSchemaAsXml();
-
-    /**
      * Returns the camel-main json schema
      *
      * @return the camel-main json schema
diff --git 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 960fb40..44aa1b1 100644
--- 
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ 
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -587,11 +587,6 @@ public class DefaultCamelCatalog extends 
AbstractCamelCatalog implements CamelCa
     }
 
     @Override
-    public String blueprintSchemaAsXml() {
-        return cache(SCHEMAS_XML + "/camel-blueprint.xsd", this::loadResource);
-    }
-
-    @Override
     public String mainJsonSchema() {
         return cache(MAIN_DIR + "/camel-main-configuration-metadata.json", 
this::loadResource);
     }
diff --git 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 707d7e6..a71f635 100644
--- 
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ 
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -85,11 +85,11 @@ public class CamelCatalogTest {
 
         assertTrue(names.contains("hystrix"));
         assertTrue(names.contains("leveldb"));
-        assertTrue(names.contains("kura"));
         assertTrue(names.contains("swagger-java"));
         assertTrue(names.contains("test-spring"));
 
         assertFalse(names.contains("http-common"));
+        assertFalse(names.contains("kura"));
         assertFalse(names.contains("core-osgi"));
         assertFalse(names.contains("file"));
         assertFalse(names.contains("ftp"));
@@ -161,10 +161,7 @@ public class CamelCatalogTest {
 
     @Test
     public void testXmlSchema() throws Exception {
-        String schema = catalog.blueprintSchemaAsXml();
-        assertNotNull(schema);
-
-        schema = catalog.springSchemaAsXml();
+        String schema = catalog.springSchemaAsXml();
         assertNotNull(schema);
     }