Fix tests todo (#1623)

* fix(tests): removed elastic search testcontainer hack. * fix(tooling): added a new line at the end of generated java files header to make generated files more consistent in formatting
apache · May 8, 2024 · 72117f6 · 72117f6
1 parent fcbfb2a
commit 72117f6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 65 deletions.
diff --git a/...che/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerServiceHack.java b/...che/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerServiceHack.java
diff --git a/...java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java b/...java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
@@ -29,7 +29,7 @@
 import org.apache.camel.kafkaconnector.elasticsearch.clients.ElasticSearchClient;
 import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchCommon;
 import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchIndexMessageProducer;
-import org.apache.camel.kafkaconnector.elasticsearch.common.ElasticSearchLocalContainerServiceHack;
+import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchLocalContainerService;
 import org.apache.camel.test.infra.elasticsearch.services.ElasticSearchService;
 import org.apache.camel.test.infra.elasticsearch.services.RemoteElasticSearchService;
 import org.junit.jupiter.api.BeforeEach;
@@ -56,8 +56,7 @@ public ElasticSearchService get() {
                         ElasticsearchContainer container =
                                 new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:8.5.2");
                         container.addEnv("xpack.security.enabled", "true");
-                        //XXX: revert back to the normal lasticSearchLocalContainerService when https://issues.apache.org/jira/browse/CAMEL-19834 is fixed
-                        return new ElasticSearchLocalContainerServiceHack(container);
+                        return new ElasticSearchLocalContainerService(container);
                     }
                 }
             ).addRemoteMapping(RemoteElasticSearchService::new).build();

diff --git a/...ts-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java b/...ts-sql/src/test/java/org/apache/camel/kafkaconnector/sql/source/CamelSourceSQLITCase.java
@@ -31,7 +31,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-//@Disabled("Database connection fails with connection refused.")
 public class CamelSourceSQLITCase extends CamelSourceTestSupport {
     private static final String DATABASE_NAME = "camel";
     private static final String USERNAME = "ckc";

diff --git a/...connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-java-header.txt b/...connector-generator-maven-plugin/src/main/resources/camel-kafka-connector-java-header.txt
@@ -13,4 +13,4 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */