Skip to content

Commit

Permalink
MGR-138 Necessary changes to pass the tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dheuvels
dheuvels committed Oct 24, 2022
1 parent b6b6443 commit 0962477
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 66 deletions.
5 changes: 5 additions & 0 deletions src/test/java/org/appng/application/manager/business/RepositoriesTest.java
View file
Expand Up @@ -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;
Expand All @@ -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";

Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/xml/LdapUsersTest-testUsers.xml
View file
Expand Up @@ -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>
Expand Down
169 changes: 103 additions & 66 deletions src/test/resources/xml/RepositoriesTest-testPackages.xml
View file
@@ -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>

0 comments on commit 0962477

Please sign in to comment.