You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sk...@apache.org on 2021/03/21 20:10:43 UTC
[ignite-3] branch main updated: IGNITE-14126 Fixed annoying
messages about dumb terminal in CLI tests. Fixes #49
This is an automated email from the ASF dual-hosted git repository.
sk0x50 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 73b28f3 IGNITE-14126 Fixed annoying messages about dumb terminal in CLI tests. Fixes #49
73b28f3 is described below
commit 73b28f353ccc8dbc4fcd8804eefef595bbdd8516
Author: Kirill Gusakov <kg...@gmail.com>
AuthorDate: Sun Mar 21 23:08:35 2021 +0300
IGNITE-14126 Fixed annoying messages about dumb terminal in CLI tests. Fixes #49
Signed-off-by: Slava Koptilin <sl...@gmail.com>
---
.../org/apache/ignite/cli/AbstractCliTest.java | 31 ++++++++++++++++++++++
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 6 ++---
.../cli/builtins/init/InitIgniteCommandTest.java | 8 +++---
.../cli/builtins/module/ModuleMangerTest.java | 7 ++---
.../org/apache/ignite/cli/ui/ProgressBarTest.java | 3 ++-
5 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/AbstractCliTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/AbstractCliTest.java
new file mode 100644
index 0000000..e0c9223
--- /dev/null
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/AbstractCliTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ */
+
+package org.apache.ignite.cli;
+
+import org.junit.jupiter.api.BeforeAll;
+
+/**
+ * Base class for any CLI tests.
+ */
+public class AbstractCliTest {
+ /** */
+ @BeforeAll
+ private static void beforeAll() {
+ System.setProperty("org.jline.terminal.dumb", "true");
+ }
+}
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
index 714b783..31e454f 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
@@ -17,6 +17,8 @@
package org.apache.ignite.cli;
+import io.micronaut.context.ApplicationContext;
+import io.micronaut.context.env.Environment;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,8 +31,6 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.stream.Collectors;
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.context.env.Environment;
import org.apache.ignite.cli.builtins.init.InitIgniteCommand;
import org.apache.ignite.cli.builtins.module.ModuleManager;
import org.apache.ignite.cli.builtins.module.ModuleRegistry;
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.when;
*/
@DisplayName("ignite")
@ExtendWith(MockitoExtension.class)
-public class IgniteCliInterfaceTest {
+public class IgniteCliInterfaceTest extends AbstractCliTest {
/** DI application context. */
ApplicationContext ctx;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
index b481ccf..bf6a875 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
@@ -17,6 +17,8 @@
package org.apache.ignite.cli.builtins.init;
+import io.micronaut.test.annotation.MockBean;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -25,8 +27,7 @@ import java.nio.file.Path;
import java.util.Collections;
import java.util.Comparator;
import javax.inject.Inject;
-import io.micronaut.test.annotation.MockBean;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.apache.ignite.cli.AbstractCliTest;
import org.apache.ignite.cli.CliPathsConfigLoader;
import org.apache.ignite.cli.builtins.SystemPathResolver;
import org.apache.ignite.cli.builtins.module.MavenArtifactResolver;
@@ -48,8 +49,7 @@ import static org.mockito.Mockito.when;
*/
@ExtendWith(MockitoExtension.class)
@MicronautTest
-public class InitIgniteCommandTest {
-
+public class InitIgniteCommandTest extends AbstractCliTest {
/** */
@Inject
SystemPathResolver pathRslvr;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/builtins/module/ModuleMangerTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/builtins/module/ModuleMangerTest.java
index 58eac91..742726b 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/builtins/module/ModuleMangerTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/builtins/module/ModuleMangerTest.java
@@ -17,6 +17,8 @@
package org.apache.ignite.cli.builtins.module;
+import io.micronaut.test.annotation.MockBean;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -27,8 +29,7 @@ import java.util.jar.Attributes;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
import javax.inject.Inject;
-import io.micronaut.test.annotation.MockBean;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.apache.ignite.cli.AbstractCliTest;
import org.apache.ignite.cli.IgnitePaths;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -47,7 +48,7 @@ import static org.mockito.Mockito.when;
*/
@ExtendWith(MockitoExtension.class)
@MicronautTest
-public class ModuleMangerTest {
+public class ModuleMangerTest extends AbstractCliTest {
/** */
@Inject
MavenArtifactResolver mavenArtifactRslvr;
diff --git a/modules/cli/src/test/java/org/apache/ignite/cli/ui/ProgressBarTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/ui/ProgressBarTest.java
index ccf74e4..4ebbca8 100644
--- a/modules/cli/src/test/java/org/apache/ignite/cli/ui/ProgressBarTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/ui/ProgressBarTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.cli.ui;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import org.apache.ignite.cli.AbstractCliTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static picocli.CommandLine.Help.Ansi.AUTO;
/** */
-public class ProgressBarTest {
+public class ProgressBarTest extends AbstractCliTest {
/** */
private PrintWriter out;