diff --git a/bundle/META-INF/MANIFEST.MF b/bundle/META-INF/MANIFEST.MF index 413aef4..976eadd 100644 --- a/bundle/META-INF/MANIFEST.MF +++ b/bundle/META-INF/MANIFEST.MF @@ -30,5 +30,4 @@ Export-Package: com.jfrog.ide.eclipse.configuration, com.jfrog.ide.eclipse.ui, com.jfrog.ide.eclipse.ui.actions, com.jfrog.ide.eclipse.ui.issues, - com.jfrog.ide.eclipse.ui.licenses, com.jfrog.ide.eclipse.utils diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java index ebb70cc..8514cbc 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/configuration/XrayGlobalConfiguration.java @@ -12,7 +12,6 @@ import com.jfrog.ide.eclipse.ui.ComponentDetails; import com.jfrog.ide.eclipse.ui.issues.ComponentIssueDetails; -import com.jfrog.ide.eclipse.ui.licenses.ComponentLicenseDetails; /** * Panel for configuring Xray URL, username and password. @@ -49,7 +48,7 @@ public boolean performOk() { return true; } boolean doQuickScan = false; - ComponentDetails[] componentsDetails = { ComponentIssueDetails.getInstance(), ComponentLicenseDetails.getInstance() }; + ComponentDetails[] componentsDetails = { ComponentIssueDetails.getInstance()}; for (ComponentDetails componentsDetail : componentsDetails) { if (componentsDetail != null) { componentsDetail.credentialsSet(); diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java index 9b79335..73723ab 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/scan/ScanManager.java @@ -24,7 +24,6 @@ import com.jfrog.ide.eclipse.scheduling.ScanJob; import com.jfrog.ide.eclipse.ui.FilterManagerSingleton; import com.jfrog.ide.eclipse.ui.issues.IssuesTree; -import com.jfrog.ide.eclipse.ui.licenses.LicensesTree; import com.jfrog.ide.eclipse.utils.ProjectsMap; import com.jfrog.xray.client.services.summary.Components; import org.jfrog.build.api.util.Log; @@ -76,23 +75,21 @@ public IProgressMonitor getMonitor(){ * @param parent - The parent UI composite. Cancel the scan if the parent is * disposed. */ - public void scanAndUpdateResults(boolean quickScan, IssuesTree issuesTree, LicensesTree licensesTree, Composite parent) { - ScanJob.doSchedule(project.getName(), new ScanRunnable(parent, issuesTree, licensesTree, quickScan)); + public void scanAndUpdateResults(boolean quickScan, IssuesTree issuesTree, Composite parent) { + ScanJob.doSchedule(project.getName(), new ScanRunnable(parent, issuesTree, quickScan)); } /** * Start a dependency scan. */ private class ScanRunnable implements ICoreRunnable { - private LicensesTree licensesTree; private IssuesTree issuesTree; private boolean quickScan; private Composite parent; - private ScanRunnable(Composite parent, IssuesTree issuesTree, LicensesTree licensesTree, boolean quickScan) { + private ScanRunnable(Composite parent, IssuesTree issuesTree, boolean quickScan) { this.parent = parent; this.issuesTree = issuesTree; - this.licensesTree = licensesTree; this.quickScan = quickScan; } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/ComponentDetails.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/ComponentDetails.java index 16e879a..1f22881 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/ComponentDetails.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/ComponentDetails.java @@ -3,30 +3,20 @@ import static com.jfrog.ide.eclipse.ui.UiUtils.createLabel; import static com.jfrog.ide.eclipse.ui.UiUtils.setGridLayout; -import java.util.Set; - -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.program.Program; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Link; import org.eclipse.ui.forms.events.HyperlinkAdapter; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.Hyperlink; import org.jfrog.build.extractor.scan.DependencyTree; import org.jfrog.build.extractor.scan.GeneralInfo; -import org.jfrog.build.extractor.scan.License; -import com.jfrog.ide.common.utils.Utils; import com.jfrog.ide.eclipse.configuration.XrayGlobalConfiguration; import com.jfrog.ide.eclipse.configuration.XrayServerConfigImpl; @@ -106,7 +96,7 @@ protected void createComponentsPanel() { } /** - * Create the common information between issues and licenses tabs. + * Create the common information. * * @param node - Extract the component information from this node. */ @@ -123,7 +113,6 @@ protected void createCommonInfo(DependencyTree node) { addSection("Version:", generalInfo.getVersion()); addSection("Type:", StringUtils.capitalize(generalInfo.getPkgType())); addSection("Path:", generalInfo.getPath()); - addLicenses(node.getLicenses()); refreshPanel(); } @@ -143,36 +132,4 @@ protected void refreshPanel() { componentDetailsPanel.pack(); } - /** - * Add licenses to panel. - * - * @param licenses - The licenses to add. - */ - private void addLicenses(Set licenses) { - if (licenses.isEmpty()) { - return; - } - createLabel(componentDetailsPanel, "Licenses:"); - Panel licensesPanel = new Panel(componentDetailsPanel); - licensesPanel.setLayout(GridLayoutFactory.fillDefaults().spacing(0, 0).create()); - licenses.forEach(license -> { - if (CollectionUtils.isEmpty(license.getMoreInfoUrl())) { - // Add a license without URL. - createLabel(licensesPanel, Utils.createLicenseString(license)); - } else { - // Add a license with URL. - addHyperlink(licensesPanel, Utils.createLicenseString(license), license.getMoreInfoUrl().get(0)); - } - }); - } - - private static void addHyperlink(Panel parent, String text, String url) { - Link link = new Link(parent, SWT.NONE); - link.setText("" + text + ""); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Program.launch(url); - } - }); - } } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/FilterDialog.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/FilterDialog.java index 3d4b234..f2712a9 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/FilterDialog.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/FilterDialog.java @@ -35,7 +35,7 @@ public abstract class FilterDialog extends Dialog { * Construct a filter dialog. * * @param parentShell - The shell that will contain the dialog. - * @param title - Filter dialog title - "Severity" or "License". + * @param title - Filter dialog title - "Severity". * @param selectAllState - The state of "All" checkbox. */ public FilterDialog(Shell parentShell, String title, MutableBoolean selectAllState) { diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/PartControl.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/PartControl.java index e880ae0..7a8b0b5 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/PartControl.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/PartControl.java @@ -15,9 +15,6 @@ import com.jfrog.ide.eclipse.ui.issues.ComponentIssueDetails; import com.jfrog.ide.eclipse.ui.issues.IssuesTab; import com.jfrog.ide.eclipse.ui.issues.IssuesTree; -import com.jfrog.ide.eclipse.ui.licenses.ComponentLicenseDetails; -import com.jfrog.ide.eclipse.ui.licenses.LicensesTab; -import com.jfrog.ide.eclipse.ui.licenses.LicensesTree; /** * The entry point of the plug-in. Creates the UI and perform a quick scan if @@ -41,7 +38,6 @@ private void createTabs(Composite parent, XrayScanToolbar xrayScanToolbar) { tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH)); new IssuesTab(tabFolder); - new LicensesTab(tabFolder); tabFolder.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { xrayScanToolbar.setFilterType(FilterType.values()[tabFolder.getSelectionIndex()]); @@ -59,9 +55,7 @@ private void doQuickScan(Composite parent) { @PreDestroy public void dispose() { ComponentIssueDetails.disposeComponentDetails(); - ComponentLicenseDetails.disposeComponentDetails(); IssuesTree.disposeTree(); - LicensesTree.disposeTree(); IconManager.dispose(); } } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/SearchableTree.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/SearchableTree.java index ab1904b..c51272c 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/SearchableTree.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/SearchableTree.java @@ -22,7 +22,7 @@ import com.jfrog.ide.eclipse.utils.ProjectsMap; /** - * Base class for the issues and licenses trees. + * Base class for the issues tree. * * @author yahavi */ diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/CollapseAll.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/CollapseAll.java index e404106..22dfb2c 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/CollapseAll.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/CollapseAll.java @@ -3,10 +3,9 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.ToolBar; import com.jfrog.ide.eclipse.ui.issues.IssuesTree; -import com.jfrog.ide.eclipse.ui.licenses.LicensesTree; /** - * Collapse the issue/licenses tree. + * Collapse the issues tree. * * @author yahavi */ @@ -19,6 +18,5 @@ public CollapseAll(ToolBar toolBar) { @Override public void execute(SelectionEvent event) { IssuesTree.getInstance().collapseAll(); - LicensesTree.getInstance().collapseAll(); } } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/ExpandAll.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/ExpandAll.java index d8f9e99..8e7db30 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/ExpandAll.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/ExpandAll.java @@ -3,10 +3,8 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.ToolBar; import com.jfrog.ide.eclipse.ui.issues.IssuesTree; -import com.jfrog.ide.eclipse.ui.licenses.LicensesTree; - /** - * Expand the issue/licenses tree. + * Expand the issues tree. * * @author yahavi */ @@ -19,6 +17,5 @@ public ExpandAll(ToolBar toolBar) { @Override public void execute(SelectionEvent event) { IssuesTree.getInstance().expandAll(); - LicensesTree.getInstance().expandAll(); } } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/Filter.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/Filter.java index 584ac5b..5bd8380 100644 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/Filter.java +++ b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/actions/Filter.java @@ -3,7 +3,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.widgets.ToolBar; import com.jfrog.ide.eclipse.ui.issues.IssuesFilterDialog; -import com.jfrog.ide.eclipse.ui.licenses.LicensesFilterDialog; /** * Open the filter dialog. @@ -13,7 +12,7 @@ public class Filter extends Action { public enum FilterType { - Severity, License + Severity } private FilterType filterType = FilterType.Severity; @@ -27,8 +26,6 @@ public Filter(ToolBar toolBar) { public void execute(SelectionEvent event) { if (filterType == FilterType.Severity) { new IssuesFilterDialog(getDisplay().getActiveShell(), "Severities").open(); - } else { - new LicensesFilterDialog(getDisplay().getActiveShell(), "Licenses").open(); } } diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/ComponentLicenseDetails.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/ComponentLicenseDetails.java deleted file mode 100644 index f4dd8f4..0000000 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/ComponentLicenseDetails.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jfrog.ide.eclipse.ui.licenses; - -import org.eclipse.swt.widgets.Composite; -import org.jfrog.build.extractor.scan.DependencyTree; -import com.jfrog.ide.eclipse.ui.ComponentDetails; - -/** - * @author yahavi - */ -public class ComponentLicenseDetails extends ComponentDetails { - - private static ComponentLicenseDetails instance; - - public static ComponentLicenseDetails createComponentLicenseDetails(Composite parent) { - instance = new ComponentLicenseDetails(parent); - return instance; - } - - public static ComponentLicenseDetails getInstance() { - return instance; - } - - private ComponentLicenseDetails(Composite parent) { - super(parent, "Details"); - } - - @Override - public void createDetailsView(DependencyTree node) { - createCommonInfo(node); - refreshPanel(); - } - - public static void disposeComponentDetails() { - if (instance != null) { - instance.dispose(); - } - } -} diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesFilterDialog.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesFilterDialog.java deleted file mode 100644 index a214322..0000000 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesFilterDialog.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.jfrog.ide.eclipse.ui.licenses; - -import org.apache.commons.lang3.mutable.MutableBoolean; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.jfrog.build.extractor.scan.License; - -import com.jfrog.ide.eclipse.ui.FilterDialog; -import com.jfrog.ide.eclipse.ui.FilterManagerSingleton; - -/** - * @author yahavi - */ -public class LicensesFilterDialog extends FilterDialog { - - private static MutableBoolean selectAllState = new MutableBoolean(true); - - public LicensesFilterDialog(Shell parentShell, String title) { - super(parentShell, title, selectAllState); - } - - @Override - protected Control createDialogArea(Composite parent) { - Composite container = (Composite) super.createDialogArea(parent); - FilterManagerSingleton.getInstance().getSelectedLicenses().forEach((license, isSelected) -> { - buttons.add(new LicenseButton(container, license, isSelected)); - }); - return container; - } - - private class LicenseButton extends FilterButton { - public LicenseButton(Composite parent, License license, boolean isSelected) { - super(parent, license.getName(), isSelected); - addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - super.widgetSelected(event); - Button button = (Button) event.getSource(); - FilterManagerSingleton.getInstance().getSelectedLicenses().replace(license, button.getSelection()); - LicensesTree.getInstance().applyFiltersForAllProjects(); - } - }); - } - } - - @Override - protected void selectAll() { - FilterManagerSingleton.getInstance().getSelectedLicenses().replaceAll((license, isSelected) -> { - return selectAllButton.getSelection(); - }); - LicensesTree.getInstance().applyFiltersForAllProjects(); - } - -} diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTab.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTab.java deleted file mode 100644 index 272d296..0000000 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTab.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jfrog.ide.eclipse.ui.licenses; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CTabFolder; -import org.eclipse.swt.custom.CTabItem; -import org.eclipse.swt.custom.SashForm; - -import com.jfrog.ide.eclipse.ui.ComponentDetails; - -/** - * @author yahavi - */ -public class LicensesTab { - - public LicensesTab(CTabFolder parent) { - CTabItem tab = new CTabItem(parent, SWT.NONE); - tab.setText("Licenses Info"); - SashForm horizontalDivision = new SashForm(parent, SWT.HORIZONTAL); - - // Left - LicensesTree.createLicensesTree(horizontalDivision); - - // Right - ComponentDetails componentDetails = ComponentLicenseDetails.createComponentLicenseDetails(horizontalDivision); - - LicensesTree licensesTree = LicensesTree.getInstance(); - licensesTree.setComponentDetails(componentDetails); - horizontalDivision.setWeights(new int[] { 1, 2 }); - tab.setControl(horizontalDivision); - } -} diff --git a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTree.java b/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTree.java deleted file mode 100644 index 6cbc72c..0000000 --- a/bundle/src/main/java/com/jfrog/ide/eclipse/ui/licenses/LicensesTree.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.jfrog.ide.eclipse.ui.licenses; - -import java.util.Map.Entry; - -import org.eclipse.jface.viewers.ColumnLabelProvider; -import org.eclipse.swt.widgets.Composite; -import org.jfrog.build.extractor.scan.DependencyTree; - -import com.jfrog.ide.common.filter.FilterManager; -import com.jfrog.ide.eclipse.ui.FilterManagerSingleton; -import com.jfrog.ide.eclipse.ui.SearchableTree; -import com.jfrog.ide.eclipse.utils.ProjectsMap; - -/** - * @author yahavi - */ -public class LicensesTree extends SearchableTree { - - private static LicensesTree instance; - private DependencyTree root = new DependencyTree();; - - public static void createLicensesTree(Composite parent) { - instance = new LicensesTree(parent); - } - - public static LicensesTree getInstance() { - return instance; - } - - private LicensesTree(Composite parent) { - super(parent, new ColumnLabelProvider()); - applyFiltersForAllProjects(); - } - - @Override - protected void onClick(DependencyTree selection) { - componentDetails.createDetailsView(selection); - } - - @Override - public void applyFilters(ProjectsMap.ProjectKey projectName) { - DependencyTree project = projects.get(projectName); - if (project != null) { - FilterManager filterManager = FilterManagerSingleton.getInstance(); - DependencyTree filteredRoot = filterManager.applyFilters(project); - root.add(filteredRoot); - if (root.getChildCount() == 1) { - // If there is only one project - Show only its dependencies in the tree viewer. - treeViewer.setInput(filteredRoot); - } else { - treeViewer.setInput(root); - } - } - } - - @Override - public void applyFiltersForAllProjects() { - root.removeAllChildren(); - for (Entry entry : projects.entrySet()) { - applyFilters(entry.getKey()); - } - } - - @Override - public void reset() { - super.reset(); - root.removeAllChildren(); - treeViewer.setInput(root); - } - - public static void disposeTree() { - if (instance != null) { - instance.dispose(); - } - } -} diff --git a/tests/src/main/java/com/jfrog/ide/eclipse/scan/GradleScanManagerTest.java b/tests/src/main/java/com/jfrog/ide/eclipse/scan/GradleScanManagerTest.java deleted file mode 100644 index 3fd5ac1..0000000 --- a/tests/src/main/java/com/jfrog/ide/eclipse/scan/GradleScanManagerTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.jfrog.ide.eclipse.scan; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; - -import com.jfrog.ide.eclipse.utils.GradleArtifact; -import com.jfrog.ide.eclipse.utils.Utils; - -import junit.framework.TestCase; - -public class GradleScanManagerTest extends TestCase { - - public void testIsApplicable() throws CoreException, IOException { - IProject project = getGradleProject("gradleIsApplicable"); - assertTrue(GradleScanManager.isApplicable(project)); - } - - public void testIsNotApplicable() throws CoreException, IOException { - IProject project = getGradleProject("gradleIsNotApplicable"); - assertFalse(GradleScanManager.isApplicable(project)); - } - - public void testCreateGradleFile() throws IOException, CoreException { - IProject project = getGradleProject("gradleIsApplicable"); - GradleScanManager gradleScanManager = new GradleScanManager(project); - String gradleFileLocation = Utils.getGradleInitScriptLocation(gradleScanManager); - File gradleScriptExpectedLocation = Paths.get(System.getProperty("user.home"), ".jfrog-eclipse-plugin", GradleScanManager.GRADLESCRIPTDIR, GradleScanManager.GRADLE_INIT_SCRIPT).toFile(); - assertTrue(gradleScriptExpectedLocation.exists()); - assertEquals(gradleScriptExpectedLocation.getAbsolutePath(), gradleFileLocation); - } - - public void testReadGeneratedJSonFile() throws IOException, CoreException { - GradleScanManager gradleScanManager = generateDependenciesGraph("gradleIsApplicable"); - byte[] json = gradleScanManager.readGeneratedJson(); - byte[] result = Utils.getResultContent("generatedJson", "generatedGradleJson.txt"); - assertEquals(new String(result).replace("\n", "").replace("\r", ""), new String(json).replace("\n", "").replace("\r", "")); - } - - public void testParseJsonResult() throws IOException, CoreException { - GradleScanManager gradleScanManager = generateDependenciesGraph("gradleIsApplicable"); - gradleScanManager.parseJsonResult(); - GradleArtifact gradleArtifact = gradleScanManager.getGradleArtifact(); - assertEquals("gradleIsApplicable", gradleArtifact.artifactId); - assertEquals("jfrog.org", gradleArtifact.groupId); - assertEquals("1.0.0", gradleArtifact.version); - assertEquals(1, gradleArtifact.getDependencies().length); - } - - public void testParseNoDependenciesProject() throws IOException, CoreException { - GradleScanManager gradleScanManager = generateDependenciesGraph("gradleNoDependencies"); - gradleScanManager.parseJsonResult(); - GradleArtifact gradleArtifact = gradleScanManager.getGradleArtifact(); - assertEquals("gradleNoDependencies", gradleArtifact.artifactId); - assertEquals("jfrog.org", gradleArtifact.groupId); - assertEquals("1.0.0", gradleArtifact.version); - assertEquals(0, gradleArtifact.getDependencies().length); - } - - public void testParseMultipleDependenciesProject() throws IOException, CoreException { - GradleScanManager gradleScanManager = generateDependenciesGraph("gradleMultipleDependencies"); - gradleScanManager.parseJsonResult(); - GradleArtifact gradleArtifact = gradleScanManager.getGradleArtifact(); - assertEquals("gradleMultipleDependencies", gradleArtifact.artifactId); - assertEquals("jfrog.org", gradleArtifact.groupId); - assertEquals("1.0.0", gradleArtifact.version); - assertEquals(6, gradleArtifact.getDependencies().length); - } - - public void testParseDependenciesThatDoesNotExists() throws IOException, CoreException { - GradleScanManager gradleScanManager = generateDependenciesGraph("gradleWithMissingDependencies"); - gradleScanManager.parseJsonResult(); - GradleArtifact gradleArtifact = gradleScanManager.getGradleArtifact(); - assertEquals("gradleWithMissingDependencies", gradleArtifact.artifactId); - assertEquals("jfrog.org", gradleArtifact.groupId); - assertEquals("1.0.0", gradleArtifact.version); - assertEquals(2, gradleArtifact.getDependencies().length); - } - - private GradleScanManager generateDependenciesGraph(String projectName) throws IOException, CoreException { - IProject project = getGradleProject(projectName); - GradleScanManager gradleScanManager = new GradleScanManager(project); - String gradleFileLocation = Utils.getGradleInitScriptLocation(gradleScanManager); - String rootProjectDir = project.getLocation().toPortableString(); - if (project.getLocation().toFile().isDirectory()) { - rootProjectDir = project.getLocation().addTrailingSeparator().toPortableString(); - } - gradleScanManager.generateDependenciesGraphAsJsonTask(rootProjectDir, gradleFileLocation); - return gradleScanManager; - } - - private IProject getGradleProject(String projectLocation) throws IOException, CoreException { - return Utils.createProject(projectLocation, "gradle"); - } -} diff --git a/tests/src/main/java/com/jfrog/ide/eclipse/scan/MavenScanManagerTest.java b/tests/src/main/java/com/jfrog/ide/eclipse/scan/MavenScanManagerTest.java deleted file mode 100644 index b328012..0000000 --- a/tests/src/main/java/com/jfrog/ide/eclipse/scan/MavenScanManagerTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.jfrog.ide.eclipse.scan; - -import java.io.IOException; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; - -import com.jfrog.ide.eclipse.utils.Utils; - -import junit.framework.TestCase; - -public class MavenScanManagerTest extends TestCase { - - public void testIsMavenApplicable() throws CoreException, IOException { - IProject project = getMavenProject("mavenIsApplicable"); - assertTrue(MavenScanManager.isApplicable(project)); - } - - public void testIsMavenNotApplicable() throws CoreException, IOException { - IProject project = getMavenProject("mavenIsNotApplicable"); - assertFalse(MavenScanManager.isApplicable(project)); - } - - private IProject getMavenProject(String projectLocation) throws IOException, CoreException { - return Utils.createProject(projectLocation, "maven"); - } -}