changes Tycho version [4.0.0 --> 4.0.6] (#303)

Author: aarnapant-sap

pom.xml

@@ -49,7 +49,7 @@
     </profile>
   </profiles>
   <properties>
-    <tycho-version>4.0.0</tycho-version>
+    <tycho-version>4.0.6</tycho-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>

test/org.abapgit.adt.ui.test/src/org/abapgit/adt/ui/internal/wizards/TestPdeAbapGitSwitchBranchWizard.java

@@ -25,7 +25,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.sap.adt.tools.core.base.test.services.AdtPdeTestProjectUtil;
 import com.sap.adt.tools.core.model.adtcore.IAdtObjectReference;
 import com.sap.adt.tools.core.project.AdtProjectServiceFactory;
 import com.sap.adt.tools.core.ui.packages.IAdtPackageServiceUI;
@@ -43,11 +42,12 @@ public class TestPdeAbapGitSwitchBranchWizard {
     private IAdtPackageServiceUI mockPackageServiceUI;
     private IExternalRepositoryInfoService mockExternalRepoInfoService;
     private IRepositoryService mockRepoService;
-
+    
     @Before
     public void setUp() throws CoreException {
         // Create project and test data
-        mockProject = AdtPdeTestProjectUtil.createTestProject(this.getClass().getName());
+    	TestPdeAbapGitWizardUtil util = new TestPdeAbapGitWizardUtil();
+        mockProject = util.createDummyAbapProject(this.getClass().getName());
         testDestination = AdtProjectServiceFactory.createProjectService().getDestinationId(mockProject);
 
         // Create fresh mocks for each test

test/org.abapgit.adt.ui.test/src/org/abapgit/adt/ui/internal/wizards/TestPdeAbapGitSwitchBranchWizardPackageValidations.java

@@ -20,9 +20,10 @@
 import org.eclipse.jface.wizard.IWizardContainer;
 import org.eclipse.osgi.util.NLS;
 import org.junit.Before;
+import org.junit.After;
 import org.junit.Test;
 
-import com.sap.adt.tools.core.base.test.services.AdtPdeTestProjectUtil;
+
 import com.sap.adt.tools.core.model.adtcore.IAdtObjectReference;
 import com.sap.adt.tools.core.project.AdtProjectServiceFactory;
 import com.sap.adt.tools.core.ui.packages.IAdtPackageServiceUI;
@@ -44,10 +45,12 @@ public class TestPdeAbapGitSwitchBranchWizardPackageValidations {
     private IWizardContainer mockWizardContainer;
     private IExternalRepositoryInfo mockExtRepoInfoFromSetup;
     private IAdtObjectReference mockAdtObjectRefFromSetup;
+     
 
     @Before
     public void setUp() throws CoreException {
-    	mockProject = AdtPdeTestProjectUtil.createTestProject(this.getClass().getName());
+    	TestPdeAbapGitWizardUtil util = new TestPdeAbapGitWizardUtil();
+    	mockProject = util.createDummyAbapProject(this.getClass().getName());
         testDestination = AdtProjectServiceFactory.createProjectService().getDestinationId(mockProject);
         mockSelRepo = createNiceMock(IRepository.class);
         mockPackageServiceUI = createMock(IAdtPackageServiceUI.class);
@@ -84,6 +87,13 @@ public void setUp() throws CoreException {
 
         reset(mockPackageServiceUI, mockExternalRepoInfoService, mockWizardContainer);
     }
+    
+    @After
+    public void tearDown() throws Exception {
+        if (mockProject != null && mockProject.exists()) {
+            mockProject.delete(true, true, null);
+        }
+    }
 
     @Test
     public void getPackageRef_whenPackageDoesNotExist_throwsPackageRefNotFoundException() {

test/org.abapgit.adt.ui.test/src/org/abapgit/adt/ui/internal/wizards/TestPdeAbapGitWizardUtil.java

@@ -0,0 +1,52 @@
+package org.abapgit.adt.ui.internal.wizards;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+import com.sap.adt.destinations.model.AdtDestinationDataFactory;
+import com.sap.adt.destinations.model.IDestinationData;
+import com.sap.adt.destinations.model.IDestinationDataWritable;
+import com.sap.adt.tools.core.internal.AbapProject;
+import com.sap.adt.tools.core.project.AdtProjectServiceFactory;
+import com.sap.adt.tools.core.project.IAbapProjectService;
+
+public class TestPdeAbapGitWizardUtil {
+	
+	public IProject createDummyAbapProject(String projectName) throws CoreException {
+        String destinationId = projectName;
+        IDestinationDataWritable data = AdtDestinationDataFactory.newDestinationData(destinationId);
+        data.setUser("TEST_DUMMY_USER");
+        data.setClient("777");
+        data.setLanguage("DE");
+        data.setPassword("TEST_DUMMY_PW");
+
+        String projectDestinationId = AdtProjectServiceFactory.createProjectService().createDestinationId(projectName);
+        final IDestinationData destinationData = data.getReadOnlyClone(projectDestinationId);
+        
+        
+
+        final IAbapProjectService abapProjectService = AdtProjectServiceFactory.createProjectService();
+        IWorkspace workspace = ResourcesPlugin.getWorkspace();
+        final AbapProject[] projects = new AbapProject[1];
+
+        // Clean up if project already exists
+        IProject project = workspace.getRoot().getProject(projectName);
+        if (project.exists()) {
+            project.delete(true, true, null);
+        }
+
+        workspace.run(new IWorkspaceRunnable() {
+            @Override
+            public void run(IProgressMonitor monitor) throws CoreException {
+                projects[0] = (AbapProject) abapProjectService.createAbapProject(projectName, destinationData, monitor);
+            }
+        }, new NullProgressMonitor());
+        return projects[0].getProject();
+    }
+
+}