@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.core.platform.EditionProvider.Edition; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
@RunWith(DataProviderRunner.class) | |||
@@ -211,7 +211,7 @@ public class AnalysisMetadataHolderImplTest { | |||
public void set_branch() { | |||
AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(editionProvider); | |||
underTest.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)); | |||
underTest.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); | |||
assertThat(underTest.getBranch().getName()).isEqualTo("main"); | |||
} | |||
@@ -226,7 +226,7 @@ public class AnalysisMetadataHolderImplTest { | |||
@Test | |||
public void setBranch_throws_ISE_when_called_twice() { | |||
AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(editionProvider); | |||
underTest.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)); | |||
underTest.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); | |||
assertThatThrownBy(() -> underTest.setBranch(new DefaultBranchImpl("main"))) | |||
.isInstanceOf(IllegalStateException.class) |
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.times; | |||
import static org.mockito.Mockito.verify; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class BranchLoaderTest { | |||
@@ -56,7 +56,7 @@ public class BranchLoaderTest { | |||
ScannerReport.Metadata metadata = ScannerReport.Metadata.newBuilder() | |||
.build(); | |||
DefaultBranchNameResolver branchNameResolver = mock(DefaultBranchNameResolver.class); | |||
when(branchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(branchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
new BranchLoader(metadataHolder, branchNameResolver).load(metadata); | |||
@@ -64,7 +64,7 @@ public class BranchLoaderTest { | |||
Branch branch = metadataHolder.getBranch(); | |||
assertThat(branch.isMain()).isTrue(); | |||
assertThat(branch.getName()).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(branch.getName()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -32,10 +32,10 @@ import org.sonar.db.component.ComponentDto; | |||
import org.sonar.db.component.ComponentTesting; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class ComponentUuidFactoryWithMigrationTest { | |||
private final Branch mainBranch = new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
private final Branch mainBranch = new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME); | |||
@Rule | |||
public DbTester db = DbTester.create(System2.INSTANCE); | |||
private Function<String, String> pathToKey = path -> path != null ? "project:" + path : "project"; |
@@ -25,7 +25,7 @@ import org.sonar.scanner.protocol.output.ScannerReport; | |||
import org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class DefaultBranchImplTest { | |||
private static final String PROJECT_KEY = "P"; | |||
@@ -34,11 +34,11 @@ public class DefaultBranchImplTest { | |||
@Test | |||
public void default_branch_represents_the_project() { | |||
DefaultBranchImpl branch = new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
DefaultBranchImpl branch = new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(branch.isMain()).isTrue(); | |||
assertThat(branch.getType()).isEqualTo(BranchType.BRANCH); | |||
assertThat(branch.getName()).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(branch.getName()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(branch.supportsCrossProjectCpd()).isTrue(); | |||
assertThat(branch.generateKey(PROJECT_KEY, null)).isEqualTo("P"); |
@@ -56,7 +56,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
@@ -559,7 +559,7 @@ public class BuildComponentTreeStepTest { | |||
} | |||
private void setAnalysisMetadataHolder(boolean isPr) { | |||
Branch branch = isPr ? new PrBranch(DEFAULT_PROJECT_MAIN_BRANCH_NAME) : new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
Branch branch = isPr ? new PrBranch(DEFAULT_MAIN_BRANCH_NAME) : new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME); | |||
analysisMetadataHolder.setRootComponentRef(ROOT_REF) | |||
.setAnalysisDate(ANALYSIS_DATE) | |||
.setBranch(branch) |
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when; | |||
import static org.sonar.api.measures.CoreMetrics.ALERT_STATUS_KEY; | |||
import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.ERROR; | |||
import static org.sonar.ce.task.projectanalysis.measure.Measure.Level.OK; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class QualityGateEventsStepTest { | |||
private static final String PROJECT_VERSION = randomAlphabetic(19); | |||
@@ -251,7 +251,7 @@ public class QualityGateEventsStepTest { | |||
@Test | |||
public void verify_branch_name_is_not_set_in_notification_when_main() { | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); | |||
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)) | |||
.thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(OK_QUALITY_GATE_STATUS).createNoValue())); |
@@ -55,7 +55,7 @@ import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTO | |||
import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; | |||
import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT; | |||
import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; | |||
import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
@@ -622,7 +622,7 @@ public class ReportPersistComponentsStepTest extends BaseStepTest { | |||
private ComponentDto prepareProject(Consumer<ComponentDto> populators) { | |||
ComponentDto dto = db.components().insertPrivateProject(populators); | |||
analysisMetadataHolder.setProject(Project.from(dto)); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); | |||
return dto; | |||
} | |||
@@ -98,7 +98,7 @@ import static org.sonar.api.rules.RuleType.SECURITY_HOTSPOT; | |||
import static org.sonar.ce.task.projectanalysis.component.Component.Type; | |||
import static org.sonar.ce.task.projectanalysis.component.ReportComponent.builder; | |||
import static org.sonar.ce.task.projectanalysis.step.SendIssueNotificationsStep.NOTIF_TYPES; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.BRANCH; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newBranchComponent; | |||
@@ -128,7 +128,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { | |||
.setRoot(PROJECT); | |||
@Rule | |||
public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule() | |||
.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)) | |||
.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)) | |||
.setAnalysisDate(new Date(ANALYSE_DATE)); | |||
@Rule | |||
public TemporaryFolder temp = new TemporaryFolder(); |
@@ -43,14 +43,14 @@ import org.sonar.db.component.SnapshotTesting; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class ValidateProjectStepTest { | |||
static long PAST_ANALYSIS_TIME = 1_420_088_400_000L; // 2015-01-01 | |||
static long DEFAULT_ANALYSIS_TIME = 1_433_131_200_000L; // 2015-06-01 | |||
static final String PROJECT_KEY = "PROJECT_KEY"; | |||
static final Branch DEFAULT_BRANCH = new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
static final Branch DEFAULT_BRANCH = new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME); | |||
@Rule | |||
public DbTester db = DbTester.create(System2.INSTANCE); |
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.when; | |||
import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.APPLICATION; | |||
import static org.sonar.ce.task.projectanalysis.component.ViewAttributes.Type.PORTFOLIO; | |||
import static org.sonar.ce.task.projectanalysis.component.ViewsComponent.builder; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
import static org.sonar.db.component.ComponentTesting.newSubPortfolio; | |||
@@ -97,7 +97,7 @@ public class ViewsPersistComponentsStepTest extends BaseStepTest { | |||
now = DATE_FORMAT.parse("2015-06-02"); | |||
when(system2.now()).thenReturn(now.getTime()); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_PROJECT_MAIN_BRANCH_NAME)); | |||
analysisMetadataHolder.setBranch(new DefaultBranchImpl(DEFAULT_MAIN_BRANCH_NAME)); | |||
BranchPersister branchPersister = mock(BranchPersister.class); | |||
ProjectPersister projectPersister = mock(ProjectPersister.class); | |||
underTest = new PersistComponentsStep(dbClient, treeRootHolder, system2, disabledComponentsHolder, analysisMetadataHolder, branchPersister, projectPersister); |
@@ -127,7 +127,7 @@ public class ExportBranchesStepTest { | |||
assertThat(branches).hasSize(3); | |||
ProjectDump.Branch mainBranch = branches.get(PROJECT_UUID); | |||
assertThat(mainBranch).isNotNull(); | |||
assertThat(mainBranch.getKee()).isEqualTo(BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranch.getKee()).isEqualTo(BranchDto.DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranch.getProjectUuid()).isEqualTo(PROJECT_UUID); | |||
assertThat(mainBranch.getMergeBranchUuid()).isEmpty(); | |||
assertThat(mainBranch.getBranchType()).isEqualTo("BRANCH"); |
@@ -30,8 +30,7 @@ import org.sonar.db.protobuf.DbProjectBranches; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
public class BranchDto { | |||
public static final String DEFAULT_PROJECT_MAIN_BRANCH_NAME = "main"; | |||
public static final String DEFAULT_APPLICATION_MAIN_BRANCH_NAME = "master"; | |||
public static final String DEFAULT_MAIN_BRANCH_NAME = "main"; | |||
/** | |||
* Maximum length of column "kee" |
@@ -82,7 +82,7 @@ import static org.sonar.api.resources.Qualifiers.PROJECT; | |||
import static org.sonar.api.resources.Qualifiers.SUBVIEW; | |||
import static org.sonar.api.resources.Qualifiers.VIEW; | |||
import static org.sonar.api.utils.DateUtils.parseDate; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.BRANCH; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newApplication; | |||
@@ -235,7 +235,7 @@ public class ComponentDaoTest { | |||
ComponentDto branch = db.components().insertProjectBranch(project, b -> b.setKey("my_branch").setBranchType(BRANCH)); | |||
ComponentDto file = db.components().insertComponent(newFileDto(branch)); | |||
assertThat(underTest.selectByKeyAndBranch(dbSession, project.getKey(), DEFAULT_PROJECT_MAIN_BRANCH_NAME).get().uuid()).isEqualTo(project.uuid()); | |||
assertThat(underTest.selectByKeyAndBranch(dbSession, project.getKey(), DEFAULT_MAIN_BRANCH_NAME).get().uuid()).isEqualTo(project.uuid()); | |||
assertThat(underTest.selectByKeyAndBranch(dbSession, branch.getKey(), "my_branch").get().uuid()).isEqualTo(branch.uuid()); | |||
assertThat(underTest.selectByKeyAndBranch(dbSession, file.getKey(), "my_branch").get().uuid()).isEqualTo(file.uuid()); | |||
assertThat(underTest.selectByKeyAndBranch(dbSession, "unknown", "my_branch")).isNotPresent(); |
@@ -44,7 +44,7 @@ import static java.util.Collections.singletonList; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.groups.Tuple.tuple; | |||
import static org.sonar.api.measures.Metric.ValueType.INT; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; | |||
import static org.sonar.db.measure.MeasureTesting.newLiveMeasure; | |||
@@ -333,11 +333,11 @@ public class LiveMeasureDaoTest { | |||
List<LargestBranchNclocDto> results = underTest.getLargestBranchNclocPerProject(db.getSession()); | |||
assertThat(results).hasSize(5); | |||
assertLocForProject(results.get(0), "projectWithTieOnBranchSize", DEFAULT_PROJECT_MAIN_BRANCH_NAME, 250); | |||
assertLocForProject(results.get(0), "projectWithTieOnBranchSize", DEFAULT_MAIN_BRANCH_NAME, 250); | |||
assertLocForProject(results.get(1), "projectWithTieOnOtherBranches", "tieBranch1", 230); | |||
assertLocForProject(results.get(2), "projectWithBranchBiggerThanMaster", "notMasterBranch", 200); | |||
assertLocForProject(results.get(3), "simpleProject", DEFAULT_PROJECT_MAIN_BRANCH_NAME, 10); | |||
assertLocForProject(results.get(4), "projectWithLinesButNoLoc", DEFAULT_PROJECT_MAIN_BRANCH_NAME, 0); | |||
assertLocForProject(results.get(3), "simpleProject", DEFAULT_MAIN_BRANCH_NAME, 10); | |||
assertLocForProject(results.get(4), "projectWithLinesButNoLoc", DEFAULT_MAIN_BRANCH_NAME, 0); | |||
} | |||
@Test |
@@ -28,8 +28,7 @@ import org.sonar.db.project.ProjectDto; | |||
import static com.google.common.base.Preconditions.checkArgument; | |||
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_APPLICATION_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentDto.UUID_PATH_OF_ROOT; | |||
import static org.sonar.db.component.ComponentDto.UUID_PATH_SEPARATOR; | |||
import static org.sonar.db.component.ComponentDto.formatUuidPathFromParent; | |||
@@ -219,9 +218,7 @@ public class ComponentTesting { | |||
public static BranchDto newBranchDto(ComponentDto branchComponent, BranchType branchType) { | |||
boolean isMain = branchComponent.getMainBranchProjectUuid() == null; | |||
String projectUuid = isMain ? branchComponent.uuid() : branchComponent.getMainBranchProjectUuid(); | |||
String defaultBranchName = branchComponent.qualifier() != null && branchComponent.qualifier().equals("APP") ? | |||
DEFAULT_APPLICATION_MAIN_BRANCH_NAME : DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
String key = isMain ? defaultBranchName : "branch_" + randomAlphanumeric(248); | |||
String key = isMain ? DEFAULT_MAIN_BRANCH_NAME : "branch_" + randomAlphanumeric(248); | |||
return new BranchDto() | |||
.setKey(key) |
@@ -22,7 +22,7 @@ package org.sonar.server.project; | |||
import org.sonar.api.config.Configuration; | |||
import static org.sonar.core.config.CorePropertyDefinitions.SONAR_PROJECTCREATION_MAINBRANCHNAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class DefaultBranchNameResolver { | |||
@@ -33,6 +33,6 @@ public class DefaultBranchNameResolver { | |||
} | |||
public String getEffectiveMainBranchName() { | |||
return configuration.get(SONAR_PROJECTCREATION_MAINBRANCHNAME).orElse(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
return configuration.get(SONAR_PROJECTCREATION_MAINBRANCHNAME).orElse(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
} |
@@ -55,7 +55,7 @@ import static org.sonar.api.resources.Qualifiers.APP; | |||
import static org.sonar.api.utils.DateUtils.addDays; | |||
import static org.sonar.api.utils.DateUtils.parseDateTime; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
@@ -609,12 +609,12 @@ public class IssueQueryFactoryTest { | |||
assertThat(underTest.create(new SearchRequest() | |||
.setProjects(singletonList(project.getKey())) | |||
.setBranch(DEFAULT_PROJECT_MAIN_BRANCH_NAME))) | |||
.setBranch(DEFAULT_MAIN_BRANCH_NAME))) | |||
.extracting(IssueQuery::branchUuid, query -> new ArrayList<>(query.projectUuids()), IssueQuery::isMainBranch) | |||
.containsOnly(project.uuid(), singletonList(project.uuid()), true); | |||
assertThat(underTest.create(new SearchRequest() | |||
.setComponents(singletonList(project.getKey())) | |||
.setBranch(DEFAULT_PROJECT_MAIN_BRANCH_NAME))) | |||
.setBranch(DEFAULT_MAIN_BRANCH_NAME))) | |||
.extracting(IssueQuery::branchUuid, query -> new ArrayList<>(query.projectUuids()), IssueQuery::isMainBranch) | |||
.containsOnly(project.uuid(), singletonList(project.uuid()), true); | |||
} |
@@ -106,7 +106,7 @@ public class ComponentUpdater { | |||
public ComponentDto createApplicationOrPortfolio(DbSession dbSession, NewComponent newComponent, @Nullable String userUuid, | |||
@Nullable String userLogin) { | |||
ComponentDto componentDto = createWithoutCommit(dbSession, newComponent, userUuid, userLogin, | |||
BranchDto.DEFAULT_APPLICATION_MAIN_BRANCH_NAME, c -> {}); | |||
defaultBranchNameResolver.getEffectiveMainBranchName(), c -> {}); | |||
commitAndIndex(dbSession, componentDto); | |||
return componentDto; | |||
} |
@@ -64,7 +64,7 @@ import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.alm.integration.pat.AlmPatsTesting.newAlmPatDto; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.db.permission.GlobalPermission.SCAN; | |||
@@ -99,7 +99,7 @@ public class ImportAzureProjectActionTest { | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PRIVATE); | |||
when(projectKeyGenerator.generateUniqueProjectKey(any(), any())).thenReturn(GENERATED_PROJECT_KEY); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test | |||
@@ -178,7 +178,7 @@ public class ImportAzureProjectActionTest { | |||
.findFirst(); | |||
assertThat(mainBranch).isPresent(); | |||
assertThat(mainBranch.get().getKey()).hasToString(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranch.get().getKey()).hasToString(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -71,7 +71,7 @@ import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.alm.integration.pat.AlmPatsTesting.newAlmPatDto; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.db.permission.GlobalPermission.SCAN; | |||
@@ -110,7 +110,7 @@ public class ImportBitbucketServerProjectActionTest { | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PRIVATE); | |||
when(projectKeyGenerator.generateUniqueProjectKey(any(), any())).thenReturn(GENERATED_PROJECT_KEY); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test | |||
@@ -274,7 +274,7 @@ public class ImportBitbucketServerProjectActionTest { | |||
Collection<BranchDto> branchDtos = db.getDbClient().branchDao().selectByProject(db.getSession(), projectDto.get()); | |||
List<BranchDto> collect = branchDtos.stream().filter(BranchDto::isMain).collect(Collectors.toList()); | |||
String mainBranchName = collect.iterator().next().getKey(); | |||
assertThat(mainBranchName).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranchName).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.tuple; | |||
import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.server.almintegration.ws.ImportHelper.PARAM_ALM_SETTING; | |||
import static org.sonar.server.almintegration.ws.github.ImportGithubProjectAction.PARAM_ORGANIZATION; | |||
import static org.sonar.server.almintegration.ws.github.ImportGithubProjectAction.PARAM_REPOSITORY_KEY; | |||
@@ -90,7 +90,7 @@ public class ImportGithubProjectActionTest { | |||
@Before | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PRIVATE); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -57,7 +57,7 @@ import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.verify; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.server.tester.UserSessionRule.standalone; | |||
@@ -90,7 +90,7 @@ public class ImportGitLabProjectActionTest { | |||
@Before | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PRIVATE); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test | |||
@@ -193,7 +193,7 @@ public class ImportGitLabProjectActionTest { | |||
Assertions.assertThat(db.getDbClient().branchDao().selectByProject(db.getSession(), projectDto.get())) | |||
.extracting(BranchDto::getKey, BranchDto::isMain) | |||
.containsExactlyInAnyOrder(tuple(DEFAULT_PROJECT_MAIN_BRANCH_NAME, true)); | |||
.containsExactlyInAnyOrder(tuple(DEFAULT_MAIN_BRANCH_NAME, true)); | |||
} | |||
@@ -57,7 +57,7 @@ import static org.sonar.api.utils.DateUtils.dateToLong; | |||
import static org.sonar.api.utils.DateUtils.parseDateTime; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.BRANCH; | |||
import static org.sonar.db.component.SnapshotTesting.newAnalysis; | |||
import static org.sonar.test.JsonAssert.assertJson; | |||
@@ -162,7 +162,7 @@ public class ListActionTest { | |||
assertThat(response.getBranchesList()) | |||
.extracting(Branch::getName, Branch::getIsMain, Branch::getType) | |||
.containsExactlyInAnyOrder(tuple(DEFAULT_PROJECT_MAIN_BRANCH_NAME, true, BranchType.BRANCH)); | |||
.containsExactlyInAnyOrder(tuple(DEFAULT_MAIN_BRANCH_NAME, true, BranchType.BRANCH)); | |||
} | |||
@Test | |||
@@ -195,7 +195,7 @@ public class ListActionTest { | |||
assertThat(response.getBranchesList()) | |||
.extracting(Branch::getName, Branch::getType) | |||
.containsExactlyInAnyOrder( | |||
tuple(DEFAULT_PROJECT_MAIN_BRANCH_NAME, BranchType.BRANCH), | |||
tuple(DEFAULT_MAIN_BRANCH_NAME, BranchType.BRANCH), | |||
tuple("feature/foo", BranchType.BRANCH), | |||
tuple("feature/bar", BranchType.BRANCH)); | |||
} | |||
@@ -259,7 +259,7 @@ public class ListActionTest { | |||
assertThat(response.getBranchesList()) | |||
.extracting(Branch::getName, Branch::getType) | |||
.containsExactlyInAnyOrder( | |||
tuple("master", BranchType.BRANCH), | |||
tuple("main", BranchType.BRANCH), | |||
tuple("feature/foo", BranchType.BRANCH), | |||
tuple("feature/bar", BranchType.BRANCH)); | |||
} |
@@ -40,7 +40,7 @@ import org.sonar.server.ws.WsActionTester; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.sonar.api.resources.Qualifiers.PROJECT; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class SetAutomaticDeletionProtectionActionTest { | |||
@@ -125,7 +125,7 @@ public class SetAutomaticDeletionProtectionActionTest { | |||
assertThatThrownBy(() -> tester.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam("value", "false") | |||
.execute()) | |||
.isInstanceOf(IllegalArgumentException.class) | |||
@@ -147,7 +147,7 @@ public class SetAutomaticDeletionProtectionActionTest { | |||
assertThat(db.countRowsOfTable("project_branches")).isEqualTo(2); | |||
Optional<BranchDto> mainBranch = db.getDbClient().branchDao().selectByUuid(db.getSession(), project.uuid()); | |||
assertThat(mainBranch.get().getKey()).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranch.get().getKey()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(mainBranch.get().isExcludeFromPurge()).isTrue(); | |||
Optional<BranchDto> branchDto = db.getDbClient().branchDao().selectByUuid(db.getSession(), branch.uuid()); |
@@ -67,7 +67,7 @@ import static org.mockito.Mockito.verifyNoInteractions; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.core.permission.GlobalPermissions.SCAN_EXECUTION; | |||
import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newModuleDto; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.db.permission.GlobalPermission.SCAN; | |||
@@ -101,7 +101,7 @@ public class ReportSubmitterTest { | |||
@Before | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PUBLIC); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -30,7 +30,7 @@ import org.sonar.server.exceptions.NotFoundException; | |||
import static java.lang.String.format; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
@@ -218,7 +218,7 @@ public class ComponentFinderTest { | |||
public void get_by_key_and_branch_accept_main_branch() { | |||
ComponentDto project = db.components().insertPublicProject(); | |||
assertThat(underTest.getByKeyAndBranch(dbSession, project.getKey(), DEFAULT_PROJECT_MAIN_BRANCH_NAME).uuid()).isEqualTo(project.uuid()); | |||
assertThat(underTest.getByKeyAndBranch(dbSession, project.getKey(), DEFAULT_MAIN_BRANCH_NAME).uuid()).isEqualTo(project.uuid()); | |||
} | |||
@Test |
@@ -52,8 +52,7 @@ import static org.mockito.Mockito.verify; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.api.resources.Qualifiers.APP; | |||
import static org.sonar.api.resources.Qualifiers.VIEW; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_APPLICATION_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
public class ComponentUpdaterTest { | |||
@@ -78,7 +77,7 @@ public class ComponentUpdaterTest { | |||
@Before | |||
public void before() { | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test | |||
@@ -108,7 +107,7 @@ public class ComponentUpdaterTest { | |||
Optional<BranchDto> branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), returned.uuid()); | |||
assertThat(branch).isPresent(); | |||
assertThat(branch.get().getKey()).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(branch.get().getKey()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(branch.get().getMergeBranchUuid()).isNull(); | |||
assertThat(branch.get().getBranchType()).isEqualTo(BranchType.BRANCH); | |||
assertThat(branch.get().getUuid()).isEqualTo(returned.uuid()); | |||
@@ -205,7 +204,7 @@ public class ComponentUpdaterTest { | |||
assertThat(projectIndexers.hasBeenCalled(loaded.uuid(), ProjectIndexer.Cause.PROJECT_CREATION)).isTrue(); | |||
Optional<BranchDto> branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), returned.uuid()); | |||
assertThat(branch).isPresent(); | |||
assertThat(branch.get().getKey()).isEqualTo(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
assertThat(branch.get().getKey()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
assertThat(branch.get().getMergeBranchUuid()).isNull(); | |||
assertThat(branch.get().getBranchType()).isEqualTo(BranchType.BRANCH); | |||
assertThat(branch.get().getUuid()).isEqualTo(returned.uuid()); | |||
@@ -345,6 +344,6 @@ public class ComponentUpdaterTest { | |||
Optional<BranchDto> branch = db.getDbClient().branchDao().selectByUuid(db.getSession(), app.branchUuid()); | |||
assertThat(branch).isPresent(); | |||
assertThat(branch.get().getBranchKey()).isEqualTo(DEFAULT_APPLICATION_MAIN_BRANCH_NAME); | |||
assertThat(branch.get().getBranchKey()).isEqualTo(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
} |
@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.tuple; | |||
import static org.sonar.api.utils.DateUtils.formatDateTime; | |||
import static org.sonar.api.utils.DateUtils.parseDateTime; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.BRANCH; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
@@ -292,7 +292,7 @@ public class ShowActionTest { | |||
ShowWsResponse response = ws.newRequest() | |||
.setParam(PARAM_COMPONENT, project.getKey()) | |||
.setParam(PARAM_BRANCH, DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_BRANCH, DEFAULT_MAIN_BRANCH_NAME) | |||
.executeProtobuf(ShowWsResponse.class); | |||
assertThat(response.getComponent()) |
@@ -61,7 +61,7 @@ import static org.sonar.api.resources.Qualifiers.APP; | |||
import static org.sonar.api.resources.Qualifiers.FILE; | |||
import static org.sonar.api.resources.Qualifiers.PROJECT; | |||
import static org.sonar.api.resources.Qualifiers.UNIT_TEST_FILE; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newChildComponent; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
@@ -385,7 +385,7 @@ public class TreeActionTest { | |||
TreeWsResponse response = ws.newRequest() | |||
.setParam(PARAM_COMPONENT, file.getKey()) | |||
.setParam(PARAM_BRANCH, DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_BRANCH, DEFAULT_MAIN_BRANCH_NAME) | |||
.executeProtobuf(TreeWsResponse.class); | |||
assertThat(response.getBaseComponent()).extracting(Component::getKey, Component::getBranch) |
@@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
public class PullActionTest { | |||
@@ -65,7 +65,7 @@ public class PullActionTest { | |||
private static final long NOW = 10_000_000_000L; | |||
private static final long PAST = 1_000_000_000L; | |||
private static final String DEFAULT_BRANCH = DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
private static final String DEFAULT_BRANCH = DEFAULT_MAIN_BRANCH_NAME; | |||
@Rule | |||
public DbTester dbTester = DbTester.create(); |
@@ -61,7 +61,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.protobuf.DbIssues.MessageFormattingType.CODE; | |||
@@ -69,7 +69,7 @@ public class PullTaintActionTest { | |||
private static final long NOW = 10_000_000_000L; | |||
private static final long PAST = 1_000_000_000L; | |||
private static final String DEFAULT_BRANCH = DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
private static final String DEFAULT_BRANCH = DEFAULT_MAIN_BRANCH_NAME; | |||
public static final DbIssues.MessageFormatting MESSAGE_FORMATTING = DbIssues.MessageFormatting.newBuilder().setStart(0).setEnd(4).setType(CODE).build(); | |||
@Rule |
@@ -66,7 +66,7 @@ import static org.sonar.api.utils.DateUtils.parseDateTime; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01; | |||
import static org.sonar.core.util.Uuids.UUID_EXAMPLE_02; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.BRANCH; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newDirectory; | |||
@@ -669,7 +669,7 @@ public class SearchActionComponentsTest { | |||
SearchWsResponse result = ws.newRequest() | |||
.setParam(PARAM_COMPONENT_KEYS, project.getKey()) | |||
.setParam(PARAM_BRANCH, DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_BRANCH, DEFAULT_MAIN_BRANCH_NAME) | |||
.executeProtobuf(SearchWsResponse.class); | |||
assertThat(result.getIssuesList()) |
@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.tuple; | |||
import static org.sonar.api.utils.DateUtils.parseDateTime; | |||
import static org.sonar.api.web.UserRole.USER; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchType.PULL_REQUEST; | |||
import static org.sonar.db.component.ComponentTesting.newFileDto; | |||
import static org.sonar.db.component.ComponentTesting.newProjectCopy; | |||
@@ -148,7 +148,7 @@ public class ComponentActionTest { | |||
ComponentWsResponse response = ws.newRequest() | |||
.setParam(PARAM_COMPONENT, file.getKey()) | |||
.setParam(PARAM_BRANCH, DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_BRANCH, DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_METRIC_KEYS, "complexity") | |||
.executeProtobuf(ComponentWsResponse.class); | |||
@@ -561,7 +561,7 @@ public class ComponentTreeActionTest { | |||
ComponentTreeWsResponse response = ws.newRequest() | |||
.setParam(PARAM_COMPONENT, file.getKey()) | |||
.setParam(PARAM_BRANCH, BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_BRANCH, BranchDto.DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam(PARAM_METRIC_KEYS, complexity.getKey()) | |||
.executeProtobuf(ComponentTreeWsResponse.class); | |||
@@ -50,7 +50,7 @@ import org.sonarqube.ws.NewCodePeriods.ShowWSResponse; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.SnapshotTesting.newAnalysis; | |||
public class ListActionTest { | |||
@@ -116,7 +116,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(6); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.contains(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
.contains(DEFAULT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
//check if global default is set | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getType) | |||
@@ -139,7 +139,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(6); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.contains(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
.contains(DEFAULT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
//check if global default is set | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getType) | |||
@@ -174,7 +174,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(6); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.contains(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
.contains(DEFAULT_MAIN_BRANCH_NAME, "BRANCH_0", "BRANCH_1", "BRANCH_2", "BRANCH_3", "BRANCH_4"); | |||
//check if project setting is set | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getType) | |||
@@ -192,7 +192,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isOne(); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.containsOnly(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
.containsOnly(DEFAULT_MAIN_BRANCH_NAME); | |||
//check if global setting is set | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getType) | |||
@@ -228,7 +228,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(3); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.contains(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "OWN_SETTINGS", "GLOBAL_SETTINGS"); | |||
.contains(DEFAULT_MAIN_BRANCH_NAME, "OWN_SETTINGS", "GLOBAL_SETTINGS"); | |||
Optional<ShowWSResponse> ownSettings = response.getNewCodePeriodsList().stream() | |||
.filter(s -> !s.getInherited()) | |||
@@ -283,7 +283,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(3); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.contains(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "OWN_SETTINGS", "PROJECT_SETTINGS"); | |||
.contains(DEFAULT_MAIN_BRANCH_NAME, "OWN_SETTINGS", "PROJECT_SETTINGS"); | |||
Optional<ShowWSResponse> ownSettings = response.getNewCodePeriodsList().stream() | |||
.filter(s -> !s.getInherited()) | |||
@@ -344,7 +344,7 @@ public class ListActionTest { | |||
assertThat(response).isNotNull(); | |||
assertThat(response.getNewCodePeriodsCount()).isEqualTo(2); | |||
assertThat(response.getNewCodePeriodsList()).extracting(ShowWSResponse::getBranchKey) | |||
.containsOnly(DEFAULT_PROJECT_MAIN_BRANCH_NAME, "PROJECT_BRANCH"); | |||
.containsOnly(DEFAULT_MAIN_BRANCH_NAME, "PROJECT_BRANCH"); | |||
ShowWSResponse result = response.getNewCodePeriodsList().get(0); | |||
assertThat(result.getType()).isEqualTo(NewCodePeriods.NewCodePeriodType.SPECIFIC_ANALYSIS); |
@@ -54,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.assertj.core.api.Assertions.entry; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
@RunWith(DataProviderRunner.class) | |||
public class SetActionTest { | |||
@@ -131,7 +131,7 @@ public class SetActionTest { | |||
assertThatThrownBy(() -> ws.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam("type", "number_of_days") | |||
.execute()) | |||
.isInstanceOf(IllegalArgumentException.class) | |||
@@ -146,7 +146,7 @@ public class SetActionTest { | |||
assertThatThrownBy(() -> ws.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("type", "specific_analysis") | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.execute()) | |||
.isInstanceOf(IllegalArgumentException.class) | |||
.hasMessageContaining("New Code Period type 'SPECIFIC_ANALYSIS' requires a value"); | |||
@@ -160,7 +160,7 @@ public class SetActionTest { | |||
assertThatThrownBy(() -> ws.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("type", "number_of_days") | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam("value", "unknown") | |||
.execute()) | |||
.isInstanceOf(IllegalArgumentException.class) | |||
@@ -175,7 +175,7 @@ public class SetActionTest { | |||
assertThatThrownBy(() -> ws.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("type", "specific_analysis") | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam("value", "unknown") | |||
.execute()) | |||
.isInstanceOf(NotFoundException.class) | |||
@@ -195,11 +195,11 @@ public class SetActionTest { | |||
assertThatThrownBy(() -> ws.newRequest() | |||
.setParam("project", project.getKey()) | |||
.setParam("type", "specific_analysis") | |||
.setParam("branch", DEFAULT_PROJECT_MAIN_BRANCH_NAME) | |||
.setParam("branch", DEFAULT_MAIN_BRANCH_NAME) | |||
.setParam("value", analysisBranch.getUuid()) | |||
.execute()) | |||
.isInstanceOf(IllegalArgumentException.class) | |||
.hasMessageContaining("Analysis '" + analysisBranch.getUuid() + "' does not belong to branch '" + DEFAULT_PROJECT_MAIN_BRANCH_NAME + | |||
.hasMessageContaining("Analysis '" + analysisBranch.getUuid() + "' does not belong to branch '" + DEFAULT_MAIN_BRANCH_NAME + | |||
"' of project '" + project.getKey() + "'"); | |||
} | |||
@@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.mockito.ArgumentMatchers.any; | |||
import static org.mockito.Mockito.mock; | |||
import static org.mockito.Mockito.when; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.permission.GlobalPermission.PROVISION_PROJECTS; | |||
import static org.sonar.server.project.Visibility.PRIVATE; | |||
import static org.sonar.test.JsonAssert.assertJson; | |||
@@ -96,7 +96,7 @@ public class CreateActionTest { | |||
@Before | |||
public void before() { | |||
when(projectDefaultVisibility.get(any())).thenReturn(Visibility.PUBLIC); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_PROJECT_MAIN_BRANCH_NAME); | |||
when(defaultBranchNameResolver.getEffectiveMainBranchName()).thenReturn(DEFAULT_MAIN_BRANCH_NAME); | |||
} | |||
@Test |
@@ -52,7 +52,7 @@ import org.sonar.server.ws.WsActionTester; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.assertj.core.api.Assertions.assertThatThrownBy; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_PROJECT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.component.BranchDto.DEFAULT_MAIN_BRANCH_NAME; | |||
import static org.sonar.db.newcodeperiod.NewCodePeriodType.SPECIFIC_ANALYSIS; | |||
import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_ANALYSIS; | |||
import static org.sonar.server.projectanalysis.ws.ProjectAnalysesWsParameters.PARAM_BRANCH; | |||
@@ -117,7 +117,7 @@ public class SetBaselineActionTest { | |||
ComponentDto project = tester.insertPrivateProject(); | |||
SnapshotDto analysis = db.components().insertSnapshot(project); | |||
assertThatThrownBy(() -> call(project.getKey(), DEFAULT_PROJECT_MAIN_BRANCH_NAME, analysis.getUuid())) | |||
assertThatThrownBy(() -> call(project.getKey(), DEFAULT_MAIN_BRANCH_NAME, analysis.getUuid())) | |||
.isInstanceOf(ForbiddenException.class) | |||
.hasMessage("Insufficient privileges"); | |||
} |