Fixed code
This commit is contained in:
parent
120316d1b2
commit
1fe73af6bc
|
@ -215,9 +215,7 @@ public class AccountingDashboardHarvesterPlugin extends Plugin {
|
||||||
getProperties().set(properties);
|
getProperties().set(properties);
|
||||||
|
|
||||||
ContextAuthorization contextAuthorization = new ContextAuthorization();
|
ContextAuthorization contextAuthorization = new ContextAuthorization();
|
||||||
|
|
||||||
SortedSet<String> contexts = contextAuthorization.getContexts();
|
SortedSet<String> contexts = contextAuthorization.getContexts();
|
||||||
|
|
||||||
String root = contexts.first();
|
String root = contexts.first();
|
||||||
Utils.setContext(contextAuthorization.getSecretForContext(root));
|
Utils.setContext(contextAuthorization.getSecretForContext(root));
|
||||||
|
|
||||||
|
|
|
@ -25,10 +25,10 @@ public enum HarvestedDataKey {
|
||||||
ACCESSES("VRE Accesses"),
|
ACCESSES("VRE Accesses"),
|
||||||
USERS("VRE Users"),
|
USERS("VRE Users"),
|
||||||
DATA_METHOD_DOWNLOAD("Data/Method download"),
|
DATA_METHOD_DOWNLOAD("Data/Method download"),
|
||||||
NEW_CATALOGUE_METHODS("New Catalogue Methods"),
|
// NEW_CATALOGUE_METHODS("New Catalogue Methods"),
|
||||||
NEW_CATALOGUE_DATASETS("New Catalogue Datasets"),
|
// NEW_CATALOGUE_DATASETS("New Catalogue Datasets"),
|
||||||
NEW_CATALOGUE_DELIVERABLES("New Catalogue Deliverables"),
|
// NEW_CATALOGUE_DELIVERABLES("New Catalogue Deliverables"),
|
||||||
NEW_CATALOGUE_APPLICATIONS("New Catalogue Applications"),
|
// NEW_CATALOGUE_APPLICATIONS("New Catalogue Applications"),
|
||||||
SOCIAL_POSTS("VRE Social Interations Posts"),
|
SOCIAL_POSTS("VRE Social Interations Posts"),
|
||||||
SOCIAL_REPLIES("VRE Social Interations Replies"),
|
SOCIAL_REPLIES("VRE Social Interations Replies"),
|
||||||
SOCIAL_LIKES("VRE Social Interations Likes"),
|
SOCIAL_LIKES("VRE Social Interations Likes"),
|
||||||
|
|
|
@ -92,8 +92,8 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//@Ignore
|
@Ignore
|
||||||
@Test
|
//@Test
|
||||||
public void launch() {
|
public void launch() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -109,9 +109,9 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
inputs.put(AccountingDashboardHarvesterPlugin.GET_VRE_USERS_INPUT_PARAMETER, true);
|
inputs.put(AccountingDashboardHarvesterPlugin.GET_VRE_USERS_INPUT_PARAMETER, true);
|
||||||
inputs.put(AccountingDashboardHarvesterPlugin.RERUN_INPUT_PARAMETER, true);
|
inputs.put(AccountingDashboardHarvesterPlugin.RERUN_INPUT_PARAMETER, true);
|
||||||
inputs.put(AccountingDashboardHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, true);
|
inputs.put(AccountingDashboardHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, true);
|
||||||
inputs.put(AccountingDashboardHarvesterPlugin.PARTIAL_HARVESTING, false);
|
inputs.put(AccountingDashboardHarvesterPlugin.PARTIAL_HARVESTING, true);
|
||||||
|
|
||||||
Calendar from = DateUtils.getStartCalendar(2022, Calendar.AUGUST, 1);
|
Calendar from = DateUtils.getStartCalendar(2022, Calendar.SEPTEMBER, 1);
|
||||||
String fromDate = DateUtils.LAUNCH_DATE_FORMAT.format(from.getTime());
|
String fromDate = DateUtils.LAUNCH_DATE_FORMAT.format(from.getTime());
|
||||||
logger.trace("{} is {}", AccountingDashboardHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
|
logger.trace("{} is {}", AccountingDashboardHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
|
||||||
inputs.put(AccountingDashboardHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
|
inputs.put(AccountingDashboardHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate);
|
||||||
|
@ -178,8 +178,8 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//@Ignore
|
@Ignore
|
||||||
@Test
|
// @Test
|
||||||
public void launchOldData() {
|
public void launchOldData() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -366,7 +366,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore
|
@Ignore
|
||||||
@Test
|
// @Test
|
||||||
public void testVREAccessesHarvester() throws Exception {
|
public void testVREAccessesHarvester() throws Exception {
|
||||||
try {
|
try {
|
||||||
// AccountingDao dao = getAccountingDao();
|
// AccountingDao dao = getAccountingDao();
|
||||||
|
@ -580,7 +580,8 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Ignore
|
||||||
|
//@Test
|
||||||
public void testMethodInvocationOldData() {
|
public void testMethodInvocationOldData() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -813,7 +814,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore
|
@Ignore
|
||||||
@Test
|
// @Test
|
||||||
public void testCoreServicesHarvester() {
|
public void testCoreServicesHarvester() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -849,7 +850,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore
|
@Ignore
|
||||||
@Test
|
// @Test
|
||||||
public void testCatalogueHarvester() {
|
public void testCatalogueHarvester() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue