Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Проверка redundant-export-method исключена из настроек #1409

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Проверка redundant-export-method исключена из настроек #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions ...com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/RedundantExportMethodCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*******************************************************************************/
package com.e1c.v8codestyle.bsl.check;

import static com._1c.g5.v8.dt.bsl.model.BslPackage.Literals.METHOD;
import static org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider.PERSISTED_DESCRIPTIONS;

import java.text.MessageFormat;
Expand Down Expand Up @@ -54,10 +53,7 @@
import com._1c.g5.v8.dt.common.StringUtils;
import com._1c.g5.v8.dt.mcore.util.McoreUtil;
import com._1c.g5.v8.dt.metadata.mdclass.MdClassPackage;
import com.e1c.g5.v8.dt.check.CheckComplexity;
import com.e1c.g5.v8.dt.check.ICheckParameters;
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
import com.e1c.g5.v8.dt.check.settings.IssueType;
import com.e1c.v8codestyle.bsl.ModuleStructureSection;
import com.google.inject.Inject;

Expand Down Expand Up @@ -114,19 +110,19 @@ public String getCheckId()
@Override
protected void configureCheck(CheckConfigurer builder)
{
builder.title(Messages.RedundantExportCheck_Escess_title)
//TODO Переделать реализацию проверки в рамках задачи #314
/* builder.title(Messages.RedundantExportCheck_Escess_title)
.description(Messages.RedundantExportCheck_Excess_description)
.complexity(CheckComplexity.NORMAL)
.severity(IssueSeverity.MINOR)
.issueType(IssueType.WARNING)
.disable()
.extension(ModuleTypeFilter.onlyTypes(ModuleType.MANAGER_MODULE, ModuleType.COMMON_MODULE,
ModuleType.OBJECT_MODULE))
//.extension(new StandardCheckExtension(getCheckId(), BslPlugin.PLUGIN_ID))
.module()
.checkedObjectType(METHOD)
.parameter(PARAMETER_EXCLUDE_REGION_LIST, String.class, DEFAULT_EXCLUDE_REGION_NAME_LIST,
Messages.RedundantExportCheck_Exclude_title);
Messages.RedundantExportCheck_Exclude_title);*/

}

Expand Down
9 changes: 9 additions & 0 deletions ...e.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RedundantExportMethodCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.stream.Collectors;

import org.eclipse.core.runtime.Path;
import org.junit.Ignore;
import org.junit.Test;

import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys;
Expand Down Expand Up @@ -51,6 +52,7 @@ protected String getTestConfigurationName()
return PROJECT_NAME;
}

@Ignore
@Test
public void testNoCallNoPublic() throws Exception
{
Expand All @@ -60,20 +62,23 @@ public void testNoCallNoPublic() throws Exception
assertEquals("1", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
}

@Ignore
@Test
public void testNoCallPublic() throws Exception
{
List<Marker> markers = getMarkers(MODULE_NO_CALL_PUBLIC_FILE_NAME);
assertEquals(0, markers.size());
}

@Ignore
@Test
public void testCallNoPublic() throws Exception
{
List<Marker> markers = getMarkers(MODULE_CALL_NO_PUBLIC_FILE_NAME);
assertEquals(0, markers.size());
}

@Ignore
@Test
public void testLocalCall() throws Exception
{
Expand All @@ -83,27 +88,31 @@ public void testLocalCall() throws Exception
assertEquals("2", markers.get(0).getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
}

@Ignore
@Test
public void testNotifyCall() throws Exception
{
List<Marker> markers = getMarkers(CATALOG_FORM_FILE_NAME);
assertEquals(0, markers.size());
}

@Ignore
@Test
public void testNotifyWithRegionCall() throws Exception
{
List<Marker> markers = getMarkers(CATALOG_LIST_FORM_FILE_NAME);
assertEquals(0, markers.size());
}

@Ignore
@Test
public void testEventSubscription() throws Exception
{
List<Marker> markers = getMarkers(MODULE_IS_EVENT_SUBSCRIPTION_FILE_NAME);
assertEquals(0, markers.size());
}

@Ignore
@Test
public void testScheduledJob() throws Exception
{
Expand Down
Loading