From a920215a5cec785e8e3f4bb675b18b5c8916f4dd Mon Sep 17 00:00:00 2001
From: Andrey Zelenkov <zelenkov@nginx.com>
Date: Wed, 17 Jul 2019 17:48:35 +0300
Subject: [PATCH] Tests: more Java tests.

Added test with war file and error configuration test.
---
 test/java/empty_war/empty.war | Bin 0 -> 484 bytes
 test/test_java_application.py |  40 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 test/java/empty_war/empty.war

diff --git a/test/java/empty_war/empty.war b/test/java/empty_war/empty.war
new file mode 100644
index 0000000000000000000000000000000000000000..4985e804e0a982454d480ded92efa9ab970f9451
GIT binary patch
literal 484
zcmWIWW@h1H0D<QVV*J1iD8a@cz>u0-P*SNM8o|RLYONaUC|VKol~IHt0H{ZVfddH9
z_3**<Bo-9tWhIs+g7jV#L+G74(U<Fxfk5kb%cB>jvUak+Sf;RO9ZT#EzuSSzroxjW
zxR;ij|7GkByBL`w^sKsnddtafwZ{*1xDKj*{F)ZHY{gs^QA0C{X?GTB7M0Xo|7y9i
z*~Tq?X5)1YwJA#KQVs77U%JZQm|Q$-{hv?r+m62GefxgP)g?N=b{{|QGC4u4#pnK{
zm}L{59f}f&VxGnqnwGdAU6eWg<1&Zjl(x4k#l=*NPh`COd+&4O%U>dHmwqH}=ZxOJ
z?9RyxcMm<-z3juU7rHTyXS2QmLx7#bW=A6DF;KWMG64CEOrp%V!jT6StPXD-K}=Yv
ua==3sq8|~a$Y%2~AoMS3G=b|!gfIs@gaf=;*+4ch0bvJ_b_2SNfdK&cf|=?7

literal 0
HcmV?d00001

diff --git a/test/test_java_application.py b/test/test_java_application.py
index 54ae3366..e62720d1 100644
--- a/test/test_java_application.py
+++ b/test/test_java_application.py
@@ -5,6 +5,46 @@ from unit.applications.lang.java import TestApplicationJava
 class TestJavaApplication(TestApplicationJava):
     prerequisites = ['java']
 
+    def test_java_conf_error(self):
+        self.skip_alerts.extend(
+            [
+                r'realpath.*failed',
+                r'failed to apply new conf',
+            ]
+        )
+        self.assertIn(
+            'error',
+            self.conf(
+                {
+                    "listeners": {"*:7080": {"pass": "applications/app"}},
+                    "applications": {
+                        "app": {
+                            "type": "java",
+                            "processes": 1,
+                            "working_directory": self.current_dir
+                            + "/java/empty",
+                            "webapp": self.testdir + "/java",
+                        }
+                    },
+                }
+            ),
+            'conf error',
+        )
+
+    def test_java_war(self):
+        self.load('empty_war')
+
+        self.assertIn(
+            'success',
+            self.conf(
+                '"' + self.testdir + '/java/empty.war"',
+                '/config/applications/empty_war/webapp',
+            ),
+            'configure war',
+        )
+
+        self.assertEqual(self.get()['status'], 200, 'war')
+
     def test_java_application_cookies(self):
         self.load('cookies')