Refs #21013: Migrate accounting-manager to postgresql persistence
Updated Test Files
This commit is contained in:
parent
5cde253fbb
commit
ef12d844c1
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/accounting-manager-1.12.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/accounting-manager-1.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.12.2-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.13.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -45,5 +45,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/accounting-manager-1.12.2-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/accounting-manager-1.13.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||||
<wb-module deploy-name="accounting-manager-1.12.2-SNAPSHOT">
|
<wb-module deploy-name="accounting-manager-1.13.0-SNAPSHOT">
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
|
<dependent-module archiveName="accounting-manager-theme-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/accounting-manager-theme/accounting-manager-theme">
|
||||||
|
<dependency-type>uses</dependency-type>
|
||||||
|
</dependent-module>
|
||||||
<property name="java-output-path" value="/accounting-manager/target/accounting-manager-1.3.0-SNAPSHOT/WEB-INF/classes"/>
|
<property name="java-output-path" value="/accounting-manager/target/accounting-manager-1.3.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
<property name="context-root" value="accounting-manager"/>
|
<property name="context-root" value="accounting-manager"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -257,7 +257,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- Accounting Persistence-CouchBase -->
|
<!-- Accounting Persistence -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.accounting</groupId>
|
<groupId>org.gcube.accounting</groupId>
|
||||||
<artifactId>accounting-analytics-persistence-postgresql</artifactId>
|
<artifactId>accounting-analytics-persistence-postgresql</artifactId>
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.portlets.admin.accountingmanager;
|
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
|
||||||
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.server.is.EnableTabsJAXB;
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.server.is.InformationSystemUtils;
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.shared.Constants;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author Giancarlo Panichi
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class TestAccountingMananger extends TestCase {
|
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory
|
|
||||||
.getLogger(TestAccountingMananger.class);
|
|
||||||
|
|
||||||
|
|
||||||
public void testAccountingManagerResource() {
|
|
||||||
if (Constants.TEST_ENABLE) {
|
|
||||||
logger.debug("Test Enabled");
|
|
||||||
|
|
||||||
try {
|
|
||||||
logger.debug("Scope: " + Constants.DEFAULT_SCOPE);
|
|
||||||
EnableTabsJAXB enableTabs = InformationSystemUtils
|
|
||||||
.retrieveEnableTab(Constants.DEFAULT_SCOPE);
|
|
||||||
logger.debug("EnableTabs: " + enableTabs);
|
|
||||||
assertTrue(true);
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
assertTrue("Error searching the resource!", false);
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
logger.debug("Test Disabled");
|
|
||||||
assertTrue(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,74 +0,0 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package org.gcube.portlets.admin.accountingmanager;
|
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
|
||||||
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.server.amservice.cache.AccountingCache;
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.shared.Constants;
|
|
||||||
import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author Giancarlo Panichi
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public class TestAccountingManangerCache extends TestCase {
|
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory
|
|
||||||
.getLogger(TestAccountingManangerCache.class);
|
|
||||||
|
|
||||||
public void testAccountingManagerCache() {
|
|
||||||
if (Constants.TEST_ENABLE) {
|
|
||||||
logger.debug("Test Enabled");
|
|
||||||
|
|
||||||
try {
|
|
||||||
AccountingCache accountingCache = new AccountingCache();
|
|
||||||
SeriesResponse s = new SeriesResponse();
|
|
||||||
for (int i = 0; i < 1000000; i++) {
|
|
||||||
accountingCache.putSeries("key" + i, s);
|
|
||||||
}
|
|
||||||
Thread.sleep(180000);
|
|
||||||
|
|
||||||
accountingCache.finalize();
|
|
||||||
assertTrue(true);
|
|
||||||
|
|
||||||
} catch (Throwable e) {
|
|
||||||
logger.error(e.getLocalizedMessage(), e);
|
|
||||||
assertTrue("Error in cache!", false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
logger.debug("Test Disabled");
|
|
||||||
assertTrue(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void testAccountingManagerCacheRemoveAll() {
|
|
||||||
if (Constants.TEST_ENABLE) {
|
|
||||||
logger.debug("Test Enabled");
|
|
||||||
|
|
||||||
try {
|
|
||||||
AccountingCache accountingCache = new AccountingCache();
|
|
||||||
accountingCache.finalize();
|
|
||||||
assertTrue(true);
|
|
||||||
|
|
||||||
} catch (Throwable e) {
|
|
||||||
logger.error(e.getLocalizedMessage(), e);
|
|
||||||
assertTrue("Error in cache!", false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
logger.debug("Test Disabled");
|
|
||||||
assertTrue(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue