s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Mockito tests

Browse Source
This commit is contained in:
xseris 2017-12-01 17:00:45 +01:00
parent d2648d8db8
commit f21230804b
3 changed files with 156 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
main/src/com/google/refine/ProjectManager.java
View File

@ -58,48 +58,54 @@ import com.google.refine.preference.PreferenceStore;
import com.google.refine.preference.TopList; import com.google.refine.preference.TopList;
/** /**
* ProjectManager is responsible for loading and saving the workspace and projects. * ProjectManager is responsible for loading and saving the workspace and
* projects.
* *
* *
*/ */
public abstract class ProjectManager { public abstract class ProjectManager {
// last n expressions used across all projects // last n expressions used across all projects
static protected final int s_expressionHistoryMax = 100; static protected final int s_expressionHistoryMax = 100;
// If a project has been idle this long, flush it from memory // If a project has been idle this long, flush it from memory
static protected final int PROJECT_FLUSH_DELAY = 1000 * 60 * 15; // 15 minutes static protected final int PROJECT_FLUSH_DELAY = 1000 * 60 * 15; // 15
// minutes
// Don't spend more than this much time saving projects if doing a quick save
// Don't spend more than this much time saving projects if doing a quick
// save
static protected final int QUICK_SAVE_MAX_TIME = 1000 * 30; // 30 secs static protected final int QUICK_SAVE_MAX_TIME = 1000 * 30; // 30 secs
protected Map<Long, ProjectMetadata> _projectsMetadata; protected Map<Long, ProjectMetadata> _projectsMetadata;
protected Map<String, Integer> _projectsTags;// TagName, number of projects having that tag protected Map<String, Integer> _projectsTags;// TagName, number of projects
protected PreferenceStore _preferenceStore; // having that tag
protected PreferenceStore _preferenceStore;
final static Logger logger = LoggerFactory.getLogger("ProjectManager"); final static Logger logger = LoggerFactory.getLogger("ProjectManager");
/** /**
* What caches the joins between projects. * What caches the joins between projects.
*/ */
transient protected InterProjectModel _interProjectModel = new InterProjectModel(); transient protected InterProjectModel _interProjectModel = new InterProjectModel();
/** /**
* Flag for heavy operations like creating or importing projects. Workspace saves are skipped while it's set. * Flag for heavy operations like creating or importing projects. Workspace
* saves are skipped while it's set.
*/ */
transient protected int _busy = 0; transient protected int _busy = 0;
/** /**
* While each project's metadata is loaded completely at start-up, each project's raw data * While each project's metadata is loaded completely at start-up, each
* is loaded only when the project is accessed by the user. This is because project * project's raw data is loaded only when the project is accessed by the
* metadata is tiny compared to raw project data. This hash map from project ID to project * user. This is because project metadata is tiny compared to raw project
* is more like a last accessed-last out cache. * data. This hash map from project ID to project is more like a last
* accessed-last out cache.
*/ */
transient protected Map<Long, Project> _projects; transient protected Map<Long, Project> _projects;
static public ProjectManager singleton; static public ProjectManager singleton;
protected ProjectManager(){ protected ProjectManager() {
_projectsMetadata = new HashMap<Long, ProjectMetadata>(); _projectsMetadata = new HashMap<Long, ProjectMetadata>();
_preferenceStore = new PreferenceStore(); _preferenceStore = new PreferenceStore();
_projects = new HashMap<Long, Project>(); _projects = new HashMap<Long, Project>();
@ -107,7 +113,7 @@ public abstract class ProjectManager {
preparePreferenceStore(_preferenceStore); preparePreferenceStore(_preferenceStore);
} }
public void dispose() { public void dispose() {
save(true); // complete save save(true); // complete save
@ -116,13 +122,14 @@ public abstract class ProjectManager {
project.dispose(); project.dispose();
} }
} }
_projects.clear(); _projects.clear();
_projectsMetadata.clear(); _projectsMetadata.clear();
} }
/** /**
* Registers the project in the memory of the current session * Registers the project in the memory of the current session
*
* @param project * @param project
* @param projectMetadata * @param projectMetadata
*/ */
@ -130,15 +137,17 @@ public abstract class ProjectManager {
synchronized (this) { synchronized (this) {
_projects.put(project.id, project); _projects.put(project.id, project);
_projectsMetadata.put(project.id, projectMetadata); _projectsMetadata.put(project.id, projectMetadata);
if (_projectsTags == null) if (_projectsTags == null) {
_projectsTags = new HashMap<String, Integer>(); _projectsTags = new HashMap<String, Integer>();
if(projectMetadata.getTags()!=null) { }
for (String tag : projectMetadata.getTags()) { String[] tags = projectMetadata.getTags();
if (_projectsTags.containsKey(tag)) { if (tags != null) {
_projectsTags.put(tag, _projectsTags.get(tag) + 1); for (String tag : tags) {
} else { if (_projectsTags.containsKey(tag)) {
_projectsTags.put(tag, 1); _projectsTags.put(tag, _projectsTags.get(tag) + 1);
} } else {
_projectsTags.put(tag, 1);
}
} }
} }
} }
@ -146,6 +155,7 @@ public abstract class ProjectManager {
/** /**
* Load project metadata from data storage * Load project metadata from data storage
*
* @param projectID * @param projectID
* @return * @return
*/ */
@ -153,6 +163,7 @@ public abstract class ProjectManager {
/** /**
* Loads a project from the data store into memory * Loads a project from the data store into memory
*
* @param id * @param id
* @return * @return
*/ */
@ -160,28 +171,32 @@ public abstract class ProjectManager {
/** /**
* Import project from a Refine archive * Import project from a Refine archive
*
* @param projectID * @param projectID
* @param inputStream * @param inputStream
* @param gziped * @param gziped
* @throws IOException * @throws IOException
*/ */
public abstract void importProject(long projectID, InputStream inputStream, boolean gziped) throws IOException; public abstract void importProject(long projectID, InputStream inputStream, boolean gziped)
throws IOException;
/** /**
* Export project to a Refine archive * Export project to a Refine archive
*
* @param projectId * @param projectId
* @param tos * @param tos
* @throws IOException * @throws IOException
*/ */
public abstract void exportProject(long projectId, TarOutputStream tos) throws IOException; public abstract void exportProject(long projectId, TarOutputStream tos)
throws IOException;
/** /**
* Saves a project and its metadata to the data store * Saves a project and its metadata to the data store
*
* @param id * @param id
*/ */
public void ensureProjectSaved(long id) { public void ensureProjectSaved(long id) {
synchronized(this){ synchronized (this) {
ProjectMetadata metadata = this.getProjectMetadata(id); ProjectMetadata metadata = this.getProjectMetadata(id);
if (metadata != null) { if (metadata != null) {
try { try {
@ -189,7 +204,8 @@ public abstract class ProjectManager {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}//FIXME what should be the behaviour if metadata is null? i.e. not found } // FIXME what should be the behaviour if metadata is null? i.e.
// not found
Project project = getProject(id); Project project = getProject(id);
if (project != null && metadata != null && metadata.getModified().after(project.getLastSave())) { if (project != null && metadata != null && metadata.getModified().after(project.getLastSave())) {
@ -198,29 +214,36 @@ public abstract class ProjectManager {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}//FIXME what should be the behaviour if project is null? i.e. not found or loaded. } // FIXME what should be the behaviour if project is null? i.e. not
//FIXME what should happen if the metadata is found, but not the project? or vice versa? // found or loaded.
// FIXME what should happen if the metadata is found, but not the
// project? or vice versa?
} }
} }
/** /**
* Save project metadata to the data store * Save project metadata to the data store
*
* @param metadata * @param metadata
* @param projectId * @param projectId
* @throws Exception * @throws Exception
*/ */
public abstract void saveMetadata(ProjectMetadata metadata, long projectId) throws Exception; public abstract void saveMetadata(ProjectMetadata metadata, long projectId)
throws Exception;
/** /**
* Save project to the data store * Save project to the data store
*
* @param project * @param project
* @throws IOException * @throws IOException
*/ */
protected abstract void saveProject(Project project) throws IOException; protected abstract void saveProject(Project project)
throws IOException;
/** /**
* Save workspace and all projects to data store * Save workspace and all projects to data store
*
* @param allModified * @param allModified
*/ */
public void save(boolean allModified) { public void save(boolean allModified) {
@ -236,10 +259,11 @@ public abstract class ProjectManager {
protected abstract void saveWorkspace(); protected abstract void saveWorkspace();
/** /**
* A utility class to prioritize projects for saving, depending on how long ago * A utility class to prioritize projects for saving, depending on how long
* they have been changed but have not been saved. * ago they have been changed but have not been saved.
*/ */
static protected class SaveRecord { static protected class SaveRecord {
final Project project; final Project project;
final long overdue; final long overdue;
@ -251,22 +275,26 @@ public abstract class ProjectManager {
/** /**
* Saves all projects to the data store * Saves all projects to the data store
*
* @param allModified * @param allModified
*/ */
protected void saveProjects(boolean allModified) { protected void saveProjects(boolean allModified) {
List<SaveRecord> records = new ArrayList<SaveRecord>(); List<SaveRecord> records = new ArrayList<SaveRecord>();
Date startTimeOfSave = new Date(); Date startTimeOfSave = new Date();
synchronized (this) { synchronized (this) {
for (long id : _projectsMetadata.keySet()) { for (long id : _projectsMetadata.keySet()) {
ProjectMetadata metadata = getProjectMetadata(id); ProjectMetadata metadata = getProjectMetadata(id);
Project project = _projects.get(id); // don't call getProject() as that will load the project. Project project = _projects.get(id); // don't call getProject()
// as that will load the
// project.
if (project != null) { if (project != null) {
boolean hasUnsavedChanges = boolean hasUnsavedChanges = metadata.getModified().getTime() >= project.getLastSave().getTime();
metadata.getModified().getTime() >= project.getLastSave().getTime(); // We use >= instead of just > to avoid the case where a
// We use >= instead of just > to avoid the case where a newly created project // newly created project
// has the same modified and last save times, resulting in the project not getting // has the same modified and last save times, resulting in
// the project not getting
// saved at all. // saved at all.
if (hasUnsavedChanges) { if (hasUnsavedChanges) {
@ -275,20 +303,22 @@ public abstract class ProjectManager {
records.add(new SaveRecord(project, msecsOverdue)); records.add(new SaveRecord(project, msecsOverdue));
} else if (!project.getProcessManager().hasPending() } else if (!project.getProcessManager().hasPending()
&& startTimeOfSave.getTime() - project.getLastSave().getTime() > PROJECT_FLUSH_DELAY) { && startTimeOfSave.getTime() - project.getLastSave().getTime() > PROJECT_FLUSH_DELAY) {
/* /*
* It's been a while since the project was last saved and it hasn't been * It's been a while since the project was last saved
* modified. We can safely remove it from the cache to save some memory. * and it hasn't been modified. We can safely remove it
* from the cache to save some memory.
*/ */
_projects.remove(id).dispose(); _projects.remove(id).dispose();
} }
} }
} }
} }
if (records.size() > 0) { if (records.size() > 0) {
Collections.sort(records, new Comparator<SaveRecord>() { Collections.sort(records, new Comparator<SaveRecord>() {
@Override @Override
public int compare(SaveRecord o1, SaveRecord o2) { public int compare(SaveRecord o1, SaveRecord o2) {
if (o1.overdue < o2.overdue) { if (o1.overdue < o2.overdue) {
@ -301,21 +331,17 @@ public abstract class ProjectManager {
} }
}); });
logger.info(allModified ? logger.info(allModified ? "Saving all modified projects ..." : "Saving some modified projects ...");
"Saving all modified projects ..." :
"Saving some modified projects ..."
);
for (int i = 0; for (int i = 0; i < records.size()
i < records.size() && && (allModified || (new Date().getTime() - startTimeOfSave.getTime() < QUICK_SAVE_MAX_TIME)); i++) {
(allModified || (new Date().getTime() - startTimeOfSave.getTime() < QUICK_SAVE_MAX_TIME));
i++) {
try { try {
saveProject(records.get(i).project); saveProject(records.get(i).project);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
// In case we're running low on memory, free as much as we can // In case we're running low on memory, free as much as we
// can
disposeUnmodifiedProjects(); disposeUnmodifiedProjects();
} }
} }
@ -330,9 +356,9 @@ public abstract class ProjectManager {
for (long id : _projectsMetadata.keySet()) { for (long id : _projectsMetadata.keySet()) {
ProjectMetadata metadata = getProjectMetadata(id); ProjectMetadata metadata = getProjectMetadata(id);
Project project = _projects.get(id); Project project = _projects.get(id);
if (project != null && !project.getProcessManager().hasPending() if (project != null && !project.getProcessManager().hasPending()
&& metadata.getModified().getTime() < project.getLastSave().getTime()) { && metadata.getModified().getTime() < project.getLastSave().getTime()) {
_projects.remove(id).dispose(); _projects.remove(id).dispose();
} }
} }
} }
@ -345,10 +371,10 @@ public abstract class ProjectManager {
return _interProjectModel; return _interProjectModel;
} }
/** /**
* Gets the project metadata from memory * Gets the project metadata from memory Requires that the metadata has
* Requires that the metadata has already been loaded from the data store * already been loaded from the data store
*
* @param id * @param id
* @return * @return
*/ */
@ -357,8 +383,9 @@ public abstract class ProjectManager {
} }
/** /**
* Gets the project metadata from memory * Gets the project metadata from memory Requires that the metadata has
* Requires that the metadata has already been loaded from the data store * already been loaded from the data store
*
* @param name * @param name
* @return * @return
*/ */
@ -372,12 +399,12 @@ public abstract class ProjectManager {
} }
/** /**
* Tries to find the project id when given a project name * Tries to find the project id when given a project name Requires that all
* Requires that all project metadata exists has been loaded to memory from the data store * project metadata exists has been loaded to memory from the data store
*
* @param name * @param name
* The name of the project * The name of the project
* @return * @return The id of the project, or -1 if it cannot be found
* The id of the project, or -1 if it cannot be found
*/ */
public long getProjectID(String name) { public long getProjectID(String name) {
for (Entry<Long, ProjectMetadata> entry : _projectsMetadata.entrySet()) { for (Entry<Long, ProjectMetadata> entry : _projectsMetadata.entrySet()) {
@ -387,44 +414,46 @@ public abstract class ProjectManager {
} }
return -1; return -1;
} }
/** /**
* A valid user meta data definition should have name and display property * A valid user meta data definition should have name and display property
*
* @param placeHolderJsonObj * @param placeHolderJsonObj
* @return * @return
*/ */
private boolean isValidUserMetadataDefinition(JSONObject placeHolderJsonObj) { private boolean isValidUserMetadataDefinition(JSONObject placeHolderJsonObj) {
return (placeHolderJsonObj != null && return (placeHolderJsonObj != null && placeHolderJsonObj.has("name") && placeHolderJsonObj.has("display"));
placeHolderJsonObj.has("name") &&
placeHolderJsonObj.has("display"));
} }
public void mergeEmptyUserMetadata(ProjectMetadata metadata) { public void mergeEmptyUserMetadata(ProjectMetadata metadata) {
if (metadata == null) if (metadata == null) {
return; return;
}
// place holder // place holder
JSONArray userMetadataPreference = null; JSONArray userMetadataPreference = null;
// actual metadata for project // actual metadata for project
JSONArray jsonObjArray = metadata.getUserMetadata(); JSONArray jsonObjArray = metadata.getUserMetadata();
initDisplay(jsonObjArray); initDisplay(jsonObjArray);
try { try {
String userMeta = (String)_preferenceStore.get(PreferenceStore.USER_METADATA_KEY); String userMeta = (String) _preferenceStore.get(PreferenceStore.USER_METADATA_KEY);
if (userMeta == null) if (userMeta == null) {
return; return;
}
userMetadataPreference = new JSONArray(userMeta); userMetadataPreference = new JSONArray(userMeta);
} catch (JSONException e1) { } catch (JSONException e1) {
logger.warn("wrong definition of userMetadata format. Please use form [{\"name\": \"client name\", \"display\":true}, {\"name\": \"progress\", \"display\":false}]"); logger.warn(
"wrong definition of userMetadata format. Please use form [{\"name\": \"client name\", \"display\":true}, {\"name\": \"progress\", \"display\":false}]");
logger.error(ExceptionUtils.getFullStackTrace(e1)); logger.error(ExceptionUtils.getFullStackTrace(e1));
} }
for (int index = 0; index < userMetadataPreference.length(); index++) { for (int index = 0; index < userMetadataPreference.length(); index++) {
try { try {
boolean found = false; boolean found = false;
JSONObject placeHolderJsonObj = userMetadataPreference.getJSONObject(index); JSONObject placeHolderJsonObj = userMetadataPreference.getJSONObject(index);
if (!isValidUserMetadataDefinition(placeHolderJsonObj)) { if (!isValidUserMetadataDefinition(placeHolderJsonObj)) {
logger.warn("Skipped invalid user metadata definition" + placeHolderJsonObj.toString()); logger.warn("Skipped invalid user metadata definition" + placeHolderJsonObj.toString());
continue; continue;
@ -442,18 +471,18 @@ public abstract class ProjectManager {
if (!found) { if (!found) {
placeHolderJsonObj.put("value", ""); placeHolderJsonObj.put("value", "");
metadata.getUserMetadata().put(placeHolderJsonObj); metadata.getUserMetadata().put(placeHolderJsonObj);
logger.info("Put the placeholder {} for project {}", logger.info("Put the placeholder {} for project {}", placeHolderJsonObj.getString("name"),
placeHolderJsonObj.getString("name"),
metadata.getName()); metadata.getName());
} }
} catch (JSONException e) { } catch (JSONException e) {
logger.warn("Exception when mergeEmptyUserMetadata",e); logger.warn("Exception when mergeEmptyUserMetadata", e);
} }
} }
} }
/** /**
* honor the meta data preference * honor the meta data preference
*
* @param jsonObjArray * @param jsonObjArray
*/ */
private void initDisplay(JSONArray jsonObjArray) { private void initDisplay(JSONArray jsonObjArray) {
@ -469,32 +498,33 @@ public abstract class ProjectManager {
/** /**
* Gets all the project Metadata currently held in memory. * Gets all the project Metadata currently held in memory.
*
* @return * @return
*/ */
public Map<Long, ProjectMetadata> getAllProjectMetadata() { public Map<Long, ProjectMetadata> getAllProjectMetadata() {
for(Project project : _projects.values()) { for (Project project : _projects.values()) {
mergeEmptyUserMetadata(project.getMetadata()); mergeEmptyUserMetadata(project.getMetadata());
} }
return _projectsMetadata; return _projectsMetadata;
} }
/** /**
* Gets all the project tags currently held in memory * Gets all the project tags currently held in memory
* *
* @return * @return
*/ */
public Map<String, Integer> getAllProjectTags() { public Map<String, Integer> getAllProjectTags() {
return _projectsTags; return _projectsTags;
} }
/** /**
* Gets the required project from the data store * Gets the required project from the data store If project does not already
* If project does not already exist in memory, it is loaded from the data store * exist in memory, it is loaded from the data store
*
* @param id * @param id
* the id of the project * the id of the project
* @return * @return the project with the matching id, or null if it can't be found
* the project with the matching id, or null if it can't be found
*/ */
public Project getProject(long id) { public Project getProject(long id) {
synchronized (this) { synchronized (this) {
@ -503,7 +533,7 @@ public abstract class ProjectManager {
} else { } else {
Project project = loadProject(id); Project project = loadProject(id);
if (project != null) { if (project != null) {
_projects.put(id, project); _projects.put(id, project);
} }
return project; return project;
} }
@ -512,6 +542,7 @@ public abstract class ProjectManager {
/** /**
* Gets the preference store * Gets the preference store
*
* @return * @return
*/ */
public PreferenceStore getPreferenceStore() { public PreferenceStore getPreferenceStore() {
@ -520,6 +551,7 @@ public abstract class ProjectManager {
/** /**
* Gets all expressions from the preference store * Gets all expressions from the preference store
*
* @return * @return
*/ */
public List<String> getExpressions() { public List<String> getExpressions() {
@ -528,13 +560,14 @@ public abstract class ProjectManager {
/** /**
* The history entry manager deals with changes * The history entry manager deals with changes
*
* @return manager for handling history * @return manager for handling history
*/ */
public abstract HistoryEntryManager getHistoryEntryManager(); public abstract HistoryEntryManager getHistoryEntryManager();
/** /**
* Remove the project from the data store * Remove the project from the data store
*
* @param project * @param project
*/ */
public void deleteProject(Project project) { public void deleteProject(Project project) {
@ -543,15 +576,17 @@ public abstract class ProjectManager {
/** /**
* Remove project from data store * Remove project from data store
*
* @param projectID * @param projectID
*/ */
public abstract void deleteProject(long projectID); public abstract void deleteProject(long projectID);
/** /**
* Removes project from memory * Removes project from memory
*
* @param projectID * @param projectID
*/ */
protected void removeProject(long projectID){ protected void removeProject(long projectID) {
if (_projects.containsKey(projectID)) { if (_projects.containsKey(projectID)) {
_projects.remove(projectID).dispose(); _projects.remove(projectID).dispose();
} }
@ -560,10 +595,10 @@ public abstract class ProjectManager {
} }
} }
/** /**
* Sets the flag for long running operations. This will prevent * Sets the flag for long running operations. This will prevent workspace
* workspace saves from happening while it's set. * saves from happening while it's set.
*
* @param busy * @param busy
*/ */
public void setBusy(boolean busy) { public void setBusy(boolean busy) {
@ -576,10 +611,9 @@ public abstract class ProjectManager {
} }
} }
/** /**
* Add the latest expression to the preference store * Add the latest expression to the preference store
*
* @param s * @param s
*/ */
public void addLatestExpression(String s) { public void addLatestExpression(String s) {
@ -588,13 +622,12 @@ public abstract class ProjectManager {
} }
} }
/** /**
* *
* @param ps * @param ps
*/ */
static protected void preparePreferenceStore(PreferenceStore ps) { static protected void preparePreferenceStore(PreferenceStore ps) {
ps.put("scripting.expressions", new TopList(s_expressionHistoryMax)); ps.put("scripting.expressions", new TopList(s_expressionHistoryMax));
ps.put("scripting.starred-expressions", new TopList(Integer.MAX_VALUE)); ps.put("scripting.starred-expressions", new TopList(Integer.MAX_VALUE));
} }
} }

5
main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
View File

@ -95,6 +95,7 @@ public class ProjectManagerTests extends RefineTest {
SUT.registerProject(project, metadata); SUT.registerProject(project, metadata);
AssertProjectRegistered(); AssertProjectRegistered();
verify(metadata, times(1)).getTags();
verifyNoMoreInteractions(project); verifyNoMoreInteractions(project);
verifyNoMoreInteractions(metadata); verifyNoMoreInteractions(metadata);
@ -119,6 +120,7 @@ public class ProjectManagerTests extends RefineTest {
} }
this.verifySaveTimeCompared(1); this.verifySaveTimeCompared(1);
verify(SUT, times(1)).saveProject(project); verify(SUT, times(1)).saveProject(project);
verify(metadata, times(1)).getTags();
//ensure end //ensure end
verifyNoMoreInteractions(project); verifyNoMoreInteractions(project);
@ -160,6 +162,7 @@ public class ProjectManagerTests extends RefineTest {
SUT.save(true); SUT.save(true);
verify(metadata, times(1)).getModified(); verify(metadata, times(1)).getModified();
verify(metadata, times(1)).getTags();
verify(project, times(1)).getProcessManager(); verify(project, times(1)).getProcessManager();
verify(project, times(2)).getLastSave(); verify(project, times(2)).getLastSave();
verify(project, times(1)).dispose(); verify(project, times(1)).dispose();
@ -180,6 +183,7 @@ public class ProjectManagerTests extends RefineTest {
verify(SUT, never()).saveProjects(Mockito.anyBoolean()); verify(SUT, never()).saveProjects(Mockito.anyBoolean());
verify(SUT, never()).saveWorkspace(); verify(SUT, never()).saveWorkspace();
verify(metadata, times(1)).getTags();
verifyNoMoreInteractions(project); verifyNoMoreInteractions(project);
verifyNoMoreInteractions(metadata); verifyNoMoreInteractions(metadata);
} }
@ -246,6 +250,7 @@ public class ProjectManagerTests extends RefineTest {
verify(meta, times(1)).getModified(); verify(meta, times(1)).getModified();
verify(proj, times(2)).getLastSave(); verify(proj, times(2)).getLastSave();
verify(SUT, times(1)).saveProject(proj); verify(SUT, times(1)).saveProject(proj);
verify(meta, times(1)).getTags();
verifyNoMoreInteractions(proj); verifyNoMoreInteractions(proj);
verifyNoMoreInteractions(meta); verifyNoMoreInteractions(meta);

12
main/webapp/modules/core/scripts/index/default-importing-controller/controller.js
View File

@ -350,12 +350,12 @@ Refine.TagsManager._getAllProjectTags = function() {
return a.toLowerCase().localeCompare(b.toLowerCase()); return a.toLowerCase().localeCompare(b.toLowerCase());
}); });
for (var i = 0; i < array.length; i++) { array.map(function(item){
self.allProjectTags[i] = array[i]; self.allProjectTags.push(item);
}
},
async : false
}); });
} },
async : false
});
}
return self.allProjectTags; return self.allProjectTags;
}; };