You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2021/02/15 08:09:27 UTC

[camel] 04/11: Reset print service after tests

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

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

commit 33024ec8bd324254d010395bb79ff5874da50a44
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 11 14:05:43 2021 +0100

    Reset print service after tests
---
 .../camel/component/printer/PrinterPrintTest.java  | 43 +++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index 9b30f6b..cc3b349 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -40,6 +40,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.camel.util.IOHelper;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -47,6 +48,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -60,6 +62,11 @@ public class PrinterPrintTest extends CamelTestSupport {
         setupJavaPrint();
     }
 
+    @AfterEach
+    public void tearDown() {
+        sun.awt.AppContext.getAppContext().put(PrintServiceLookup.class.getDeclaredClasses()[0], null);
+    }
+
     @Override
     public boolean isUseRouteBuilder() {
         return false;
@@ -137,9 +144,8 @@ public class PrinterPrintTest extends CamelTestSupport {
     @Test
     @Disabled
     public void testSendingFileToPrinter() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
+
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 from("direct:start").to(
@@ -154,9 +160,8 @@ public class PrinterPrintTest extends CamelTestSupport {
     @Test
     @Disabled
     public void testSendingGIFToPrinter() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
+
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 from("direct:start").to(
@@ -171,9 +176,8 @@ public class PrinterPrintTest extends CamelTestSupport {
     @Test
     @Disabled
     public void testSendingJPEGToPrinter() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
+
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 from("direct:start").to("lpr://localhost/default?copies=2&flavor=DocFlavor.INPUT_STREAM"
@@ -188,9 +192,8 @@ public class PrinterPrintTest extends CamelTestSupport {
     @Test
     @Disabled
     public void testSendingJPEGToPrinterWithLandscapePageOrientation() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
+
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 from("direct:start").to("lpr://localhost/default?flavor=DocFlavor.INPUT_STREAM"
@@ -209,9 +212,8 @@ public class PrinterPrintTest extends CamelTestSupport {
     @Test
     @Disabled
     public void testDefaultPrinterConfiguration() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
+
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 from("direct:start").to("lpr://localhost/default?sendToPrinter=false");
@@ -281,10 +283,9 @@ public class PrinterPrintTest extends CamelTestSupport {
 
     @Test
     public void printerNameTest() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
-        // setup javax.print 
+        assumeTrue(isAwtHeadless());
+
+        // setup javax.print
         PrintService ps1 = mock(PrintService.class);
         when(ps1.getName()).thenReturn("MyPrinter\\\\remote\\printer1");
         when(ps1.isDocFlavorSupported(any(DocFlavor.class))).thenReturn(Boolean.TRUE);
@@ -340,9 +341,7 @@ public class PrinterPrintTest extends CamelTestSupport {
 
     @Test
     public void setJobName() throws Exception {
-        if (isAwtHeadless()) {
-            return;
-        }
+        assumeTrue(isAwtHeadless());
 
         getMockEndpoint("mock:output").setExpectedMessageCount(1);
         context.addRoutes(new RouteBuilder() {