From 09624772e2faa1de8dd639df57dce25e52948a0b Mon Sep 17 00:00:00 2001
From: Dirk Heuvels <Dirk.Heuvels@aiticon.com>
Date: Mon, 24 Oct 2022 11:05:16 +0200
Subject: [PATCH] MGR-138 Necessary changes to pass the tests.

---
 .../manager/business/RepositoriesTest.java    |   5 +
 .../resources/xml/LdapUsersTest-testUsers.xml |   3 +
 .../xml/RepositoriesTest-testPackages.xml     | 169 +++++++++++-------
 3 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/src/test/java/org/appng/application/manager/business/RepositoriesTest.java b/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
index de5a40a..4c7cc35 100644
--- a/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
+++ b/src/test/java/org/appng/application/manager/business/RepositoriesTest.java
@@ -29,6 +29,7 @@
 import org.appng.core.model.RepositoryCacheFactory;
 import org.appng.core.model.RepositoryMode;
 import org.appng.core.model.RepositoryType;
+import org.appng.testsupport.validation.WritingXmlValidator;
 import org.appng.testsupport.validation.XPathDifferenceHandler;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -37,6 +38,10 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class RepositoriesTest extends AbstractTest {
 
+	static {
+		WritingXmlValidator.writeXml = false;
+	}
+
 	private static final String REPO_PATH = new File("target").toPath().toUri().toString();
 	private static final String REPO_EVENT = "repositoryEvent";
 
diff --git a/src/test/resources/xml/LdapUsersTest-testUsers.xml b/src/test/resources/xml/LdapUsersTest-testUsers.xml
index 5f32def..1af6244 100644
--- a/src/test/resources/xml/LdapUsersTest-testUsers.xml
+++ b/src/test/resources/xml/LdapUsersTest-testUsers.xml
@@ -18,6 +18,9 @@
             </field>
         </meta-data>
     </config>
+    <messages ref="ldapUsers">
+        <message ref="ldapUsers" class="INVALID">LDAP Authentication is disabled. Set site property 'ldapDisabled' to 'false' to enable.</message>
+    </messages>
     <data>
         <resultset chunk="0" chunkname="ldapUsers" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="-1" hits="0"/>
     </data>
diff --git a/src/test/resources/xml/RepositoriesTest-testPackages.xml b/src/test/resources/xml/RepositoriesTest-testPackages.xml
index 5e69e88..0b2b3a4 100644
--- a/src/test/resources/xml/RepositoriesTest-testPackages.xml
+++ b/src/test/resources/xml/RepositoriesTest-testPackages.xml
@@ -1,69 +1,106 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource xmlns="http://www.appng.org/schema/platform" id="packages">
-	<config>
-		<title id="packages">Packages</title>
-		<params>
-			<param name="repositoryid">1</param>
-			<param name="packagename" />
-			<param name="packageFilter">*</param>
-		</params>
-		<meta-data bindClass="org.appng.core.model.InstallablePackage" result-selector="${current.name eq packagename}">
-			<field name="name" type="text" displayLength="30" readonly="true" binding="name">
-				<sort />
-				<label id="name">Name</label>
-			</field>
-			<field name="displayName" type="text" displayLength="30" readonly="true" binding="displayName">
-				<sort />
-				<label id="displayName">Display name</label>
-			</field>
-			<field name="type" type="text" displayLength="30" readonly="true" binding="type">
-				<sort />
-				<label id="type">Type</label>
-			</field>
-			<field name="latestRelease" type="text" readonly="true" binding="latestRelease">
-				<label id="latestRelease">Latest release</label>
-			</field>
-			<field name="latestSnapshot" type="text" readonly="true" binding="latestSnapshot">
-				<label id="latestSnapshot">Latest snapshot</label>
-			</field>
-			<field name="installedVersion" type="text" readonly="true" binding="installedVersion">
-				<label id="installedVersion">Installed version</label>
-			</field>
-			<field name="installedVersion" type="image" binding="installedVersion">
-				<label></label>
-				<icon condition="${not empty current.installedVersion}">led_green</icon>
-				<icon condition="${empty current.installedVersion}">led_red</icon>
-			</field>
-			<field name="actions" type="linkpanel" binding="actions">
-				<label id="actions">Actions</label>
-			</field>
-		</meta-data>
-		<linkpanel id="actions" location="inline">
-			<link id="actions[1]" mode="intern" target="/repositories/installation/1/#{name}#tab_packages" default="true">
-				<label id="package.showVersions">Show package versions</label>
-				<icon>edit</icon>
-			</link>
-			<link id="actions[2]" mode="intern"
-				target="/repositories/installation/1?act=install&amp;packagename=#{name}&amp;packageversion=#{latestRelease}" show-disabled="true">
-				<condition expression="${(current.installedVersion ne current.latestRelease) and (not empty current.latestRelease)}" />
-				<label id="install.latestrelease">Install latest release</label>
-				<icon>d_release</icon>
-			</link>
-			<link id="actions[3]" mode="intern"
-				target="/repositories/installation/1?act=install&amp;packagename=#{name}&amp;packageversion=#{latestSnapshot}" show-disabled="true">
-				<condition expression="${not empty current.latestSnapshot}" />
-				<label id="install.latestsnapshot">Install latest snapshot</label>
-				<icon>d_snapshot</icon>
-			</link>
-		</linkpanel>
-	</config>
-	<data>
-		<selectionGroup>
-			<selection id="pf" type="text">
-				<title id="name">Name</title>
-				<option value="*" name="pf" />
-			</selection>
-		</selectionGroup>
-		<resultset chunk="0" chunkname="packages" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="-1" hits="0" />
-	</data>
+    <config>
+        <title id="packages">Packages</title>
+        <params>
+            <param name="repositoryid">1</param>
+            <param name="packagename"/>
+            <param name="packageFilter">*</param>
+        </params>
+        <meta-data bindClass="org.appng.core.model.InstallablePackage" result-selector="${current.name eq packagename}">
+            <field name="name" type="text" displayLength="30" readonly="true" binding="name">
+                <sort/>
+                <label id="name">Name</label>
+            </field>
+            <field name="displayName" type="text" displayLength="30" readonly="true" binding="displayName">
+                <sort/>
+                <label id="displayName">Display name</label>
+            </field>
+            <field name="type" type="text" displayLength="30" readonly="true" binding="type">
+                <sort/>
+                <label id="type">Type</label>
+            </field>
+            <field name="latestRelease" type="text" readonly="true" binding="latestRelease">
+                <label id="latestRelease">Latest release</label>
+            </field>
+            <field name="latestSnapshot" type="text" readonly="true" binding="latestSnapshot">
+                <label id="latestSnapshot">Latest snapshot</label>
+            </field>
+            <field name="installedVersion" type="text" readonly="true" binding="installedVersion">
+                <label id="installedVersion">Installed version</label>
+            </field>
+            <field name="installedVersion" type="image" binding="installedVersion">
+                <label></label>
+                <icon condition="${not empty current.installedVersion}">led_green</icon>
+                <icon condition="${empty current.installedVersion}">led_red</icon>
+            </field>
+            <field name="actions" type="linkpanel" binding="actions">
+                <label id="actions">Actions</label>
+            </field>
+        </meta-data>
+        <linkpanel id="actions" location="inline">
+            <link id="actions[1]" target="/repositories/installation/1/#{name}#tab_packages" mode="intern" default="true">
+                <label id="package.showVersions">Show package versions</label>
+                <icon>edit</icon>
+            </link>
+            <link id="actions[2]" target="/repositories/installation/1?act=install&amp;packagename=#{name}&amp;packageversion=#{latestRelease}" mode="intern" show-disabled="true">
+                <condition expression="${(current.installedVersion ne current.latestRelease) and (not empty current.latestRelease)}"/>
+                <label id="install.latestrelease">Install latest release</label>
+                <icon>d_release</icon>
+            </link>
+            <link id="actions[3]" target="/repositories/installation/1?act=install&amp;packagename=#{name}&amp;packageversion=#{latestSnapshot}" mode="intern" show-disabled="true">
+                <condition expression="${not empty current.latestSnapshot}"/>
+                <label id="install.latestsnapshot">Install latest snapshot</label>
+                <icon>d_snapshot</icon>
+            </link>
+        </linkpanel>
+    </config>
+    <data>
+        <selectionGroup>
+            <selection id="pf" type="text">
+                <title id="name">Name</title>
+                <option value="*" name="pf"/>
+            </selection>
+        </selectionGroup>
+        <resultset chunk="0" chunkname="packages" chunksize="10" nextchunk="0" previouschunk="0" firstchunk="0" lastchunk="0" hits="1">
+            <result>
+                <field name="name" type="text">
+                    <value>appng-manager</value>
+                </field>
+                <field name="displayName" type="text">
+                    <value>Manager</value>
+                </field>
+                <field name="type" type="text">
+                    <value>APPLICATION</value>
+                </field>
+                <field name="latestRelease" type="text">
+                    <value></value>
+                </field>
+                <field name="latestSnapshot" type="text">
+                    <value>1.20.0-SNAPSHOT</value>
+                </field>
+                <field name="installedVersion" type="text">
+                    <value></value>
+                </field>
+                <field name="installedVersion" type="image">
+                    <value></value>
+                    <icon type="class">led_red</icon>
+                </field>
+                <linkpanel id="actions" location="inline">
+                    <link id="actions[1]" target="/repositories/installation/1/appng-manager#tab_packages" mode="intern" default="true">
+                        <label id="package.showVersions">Show package versions</label>
+                        <icon>edit</icon>
+                    </link>
+                    <link id="actions[2]" target="" mode="intern" disabled="true">
+                        <label id="install.latestrelease">Install latest release</label>
+                        <icon>d_release</icon>
+                    </link>
+                    <link id="actions[3]" target="/repositories/installation/1?act=install&amp;packagename=appng-manager&amp;packageversion=1.20.0-SNAPSHOT" mode="intern">
+                        <label id="install.latestsnapshot">Install latest snapshot</label>
+                        <icon>d_snapshot</icon>
+                    </link>
+                </linkpanel>
+            </result>
+        </resultset>
+    </data>
 </datasource>