Skip to content

Commit 74d093e

Browse files
anatol-sialitskianatol-sialitski
committed
Merge branch 'master' into persisted-schema
# Conflicts: # modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/tool/XmlAdminToolDescriptorParserTest.java # modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/widget/XmlWidgetDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/app/ApplicationRelativeResolverTest.java # modules/core/core-api/src/test/java/com/enonic/xp/form/FormItemSetTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/CheckBoxTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/ComboBoxTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/CustomSelectorTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/DateTimeTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/DateTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/DoubleTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/GeoPointTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/HtmlAreaTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/LongTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/RadioButtonTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/RelativeTimeParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/TextAreaTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/TextLineTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/inputtype/TimeTypeTest.java # modules/core/core-api/src/test/java/com/enonic/xp/schema/mixin/MixinNameTest.java # modules/core/core-api/src/test/java/com/enonic/xp/schema/mixin/MixinNamesTest.java # modules/core/core-api/src/test/java/com/enonic/xp/schema/mixin/MixinTest.java # modules/core/core-api/src/test/java/com/enonic/xp/schema/mixin/MixinsTest.java # modules/core/core-api/src/test/java/com/enonic/xp/site/SiteDescriptorTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/InputTypeAliasConvertersTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlApplicationParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlContentTypeParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlInputTypeConfigMapperTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlLayoutDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlMacroDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlMixinParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlPageDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlPartDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlServiceDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlSiteParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlStyleDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlWebappDescriptorParserTest.java # modules/core/core-api/src/test/java/com/enonic/xp/xml/parser/XmlXDataParserTest.java # modules/core/core-api/src/testFixtures/java/com/enonic/xp/xml/parser/XmlModelParserTest.java # modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/schema/CmsFormFragmentServiceImplTest.java # modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/schema/ContentTypeServiceTest.java # modules/core/core-content/src/test/java/com/enonic/xp/core/impl/content/schema/XDataServiceImplTest.java # modules/core/core-content/src/test/java/com/enonic/xp/core/impl/site/CmsServiceImplTest.java # modules/core/core-repo/src/test/java/com/enonic/xp/repo/impl/elasticsearch/query/translator/factory/dsl/QueryBuilderTest.java # modules/core/core-schema/src/test/java/com/enonic/xp/core/impl/form/FormDefaultValuesProcessorImplTest.java # modules/core/core-task/src/test/java/com/enonic/xp/impl/task/XmlTaskDescriptorParserTest.java # modules/itest/itest-core/src/test/java/com/enonic/xp/core/dynamic/DynamicSchemaServiceImplTest.java # modules/lib/lib-schema/src/test/java/com/enonic/xp/lib/schema/CreateDynamicContentSchemaHandlerTest.java # modules/lib/lib-schema/src/test/java/com/enonic/xp/lib/schema/DeleteDynamicContentSchemaHandlerTest.java # modules/lib/lib-schema/src/test/java/com/enonic/xp/lib/schema/GetDynamicContentSchemaHandlerTest.java # modules/lib/lib-schema/src/test/java/com/enonic/xp/lib/schema/UpdateDynamicContentSchemaHandlerTest.java # modules/portal/portal-impl/src/test/java/com/enonic/xp/portal/impl/api/XmlApiDescriptorParserTest.java
2 parents d5997f8 + e6707b4 commit 74d093e

File tree

1,021 files changed

+5390
-6924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,021 files changed

+5390
-6924
lines changed

‎modules/admin/admin-api/src/test/java/com/enonic/xp/admin/tool/AdminToolDescriptorsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
import static org.junit.jupiter.api.Assertions.assertEquals;
1111
import static org.junit.jupiter.api.Assertions.assertTrue;
1212

13-
public class AdminToolDescriptorsTest
13+
class AdminToolDescriptorsTest
1414
{
1515
@Test
16-
public void empty()
16+
void empty()
1717
{
1818
assertTrue( AdminToolDescriptors.empty().isEmpty() );
1919
}
2020

2121
@Test
22-
public void from()
22+
void from()
2323
{
2424
final AdminToolDescriptor adminToolDescriptor1 = AdminToolDescriptor.create().
2525
displayName( "My admin tool" ).

‎modules/admin/admin-event/src/test/java/com/enonic/xp/admin/event/impl/EventApiHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static org.mockito.Mockito.verifyNoMoreInteractions;
2525
import static org.mockito.Mockito.when;
2626

27-
public class EventApiHandlerTest
27+
class EventApiHandlerTest
2828
{
2929
private EventApiHandler instance;
3030

‎modules/admin/admin-event/src/test/java/com/enonic/xp/admin/event/impl/json/EventJsonSerializerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.junit.jupiter.api.Assertions.assertEquals;
2222
import static org.junit.jupiter.api.Assertions.assertNotNull;
2323

24-
public class EventJsonSerializerTest
24+
class EventJsonSerializerTest
2525
{
2626
private static final ObjectMapper MAPPER = ObjectMapperHelper.create();
2727

@@ -32,7 +32,7 @@ public class EventJsonSerializerTest
3232
private BundleEvent bundleEvent;
3333

3434
@BeforeEach
35-
public void setup()
35+
void setup()
3636
{
3737
this.serializer = new EventJsonSerializer();
3838

@@ -45,7 +45,7 @@ public void setup()
4545
}
4646

4747
@Test
48-
public void testEvent()
48+
void testEvent()
4949
throws Exception
5050
{
5151
final Event event = Event.create( "node.created" ).

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/StatusApiHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import static org.junit.jupiter.api.Assertions.assertFalse;
1313
import static org.junit.jupiter.api.Assertions.assertNotNull;
1414

15-
public class StatusApiHandlerTest
15+
class StatusApiHandlerTest
1616
{
1717
@Test
1818
void testGetStatus()

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/app/MainWebHandlerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
import static org.mockito.Mockito.mock;
1515
import static org.mockito.Mockito.when;
1616

17-
public class MainWebHandlerTest
17+
class MainWebHandlerTest
1818
{
1919
private MainWebHandler handler;
2020

2121
@BeforeEach
22-
public void setup()
22+
void setup()
2323
{
2424
this.handler = new MainWebHandler();
2525
}
2626

2727
@Test
28-
public void testRedirect()
28+
void testRedirect()
2929
throws Exception
3030
{
3131
final WebRequest request = new WebRequest();

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/AdminSiteHandlerTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import static org.mockito.Mockito.mock;
4646
import static org.mockito.Mockito.when;
4747

48-
public class AdminSiteHandlerTest
48+
class AdminSiteHandlerTest
4949
extends BaseHandlerTest
5050
{
5151
private AdminSiteHandler handler;
@@ -60,7 +60,6 @@ public class AdminSiteHandlerTest
6060

6161
@BeforeEach
6262
public final void setup()
63-
throws Exception
6463
{
6564
this.contentService = mock( ContentService.class );
6665
this.projectService = mock( ProjectService.class );
@@ -78,14 +77,14 @@ public final void setup()
7877
}
7978

8079
@Test
81-
public void testCanHandle()
80+
void testCanHandle()
8281
{
8382
this.request.setRawPath( "/admin/site/repo/master/content/1" );
8483
assertTrue( this.handler.canHandle( this.request ) );
8584
}
8685

8786
@Test
88-
public void testCanHandleRootContent()
87+
void testCanHandleRootContent()
8988
{
9089
this.request.setRawPath( "/admin/site/repo/master" );
9190
assertTrue( this.handler.canHandle( this.request ) );
@@ -95,21 +94,21 @@ public void testCanHandleRootContent()
9594
}
9695

9796
@Test
98-
public void testCannotHandle()
97+
void testCannotHandle()
9998
{
10099
this.request.setRawPath( "/admin/repo/master/content/1" );
101100
assertFalse( this.handler.canHandle( this.request ) );
102101
}
103102

104103
@Test
105-
public void testCreatePortalRequestWithoutMode()
104+
void testCreatePortalRequestWithoutMode()
106105
{
107106
this.request.setRawPath( "/admin/site/repo/master/content/1" );
108107
assertThrows( WebException.class, () -> this.handler.createPortalRequest( this.request, this.response ) );
109108
}
110109

111110
@Test
112-
public void testCreatePortalRequest()
111+
void testCreatePortalRequest()
113112
{
114113
this.request.setRawPath( "/admin/site/edit/repo/master/content/1" );
115114
PortalRequest portalRequest = this.handler.createPortalRequest( this.request, this.response );
@@ -122,7 +121,7 @@ public void testCreatePortalRequest()
122121
}
123122

124123
@Test
125-
public void testInlineAssetRequest()
124+
void testInlineAssetRequest()
126125
{
127126
this.request.setRawPath( "/admin/site/inline/repo/draft/_/asset/com.enonic.app.superhero:1622131535374/css/style.css" );
128127
PortalRequest portalRequest = this.handler.createPortalRequest( this.request, this.response );
@@ -135,7 +134,7 @@ public void testInlineAssetRequest()
135134
}
136135

137136
@Test
138-
public void testCreatePortalRequestRootContentPath()
137+
void testCreatePortalRequestRootContentPath()
139138
{
140139
this.request.setRawPath( "/admin/site/edit/repo/master" );
141140
PortalRequest portalRequest = this.handler.createPortalRequest( this.request, this.response );
@@ -148,7 +147,7 @@ public void testCreatePortalRequestRootContentPath()
148147
}
149148

150149
@Test
151-
public void testCreatePortalRequestEmptyContentPath()
150+
void testCreatePortalRequestEmptyContentPath()
152151
{
153152
this.request.setRawPath( "/admin/site/edit/repo/master/" );
154153
PortalRequest portalRequest = this.handler.createPortalRequest( this.request, this.response );

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/AdminToolHandlerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.mockito.Mockito.mock;
3030
import static org.mockito.Mockito.when;
3131

32-
public class AdminToolHandlerTest
32+
class AdminToolHandlerTest
3333
extends BaseHandlerTest
3434
{
3535

@@ -81,38 +81,38 @@ public final void setup()
8181
}
8282

8383
@Test
84-
public void testCanHandle()
84+
void testCanHandle()
8585
{
8686
this.portalRequest.setRawPath( "/admin/webapp/tool/1" );
8787
assertTrue( this.handler.canHandle( this.portalRequest ) );
8888
}
8989

9090
@Test
91-
public void testWithoutPermissions()
91+
void testWithoutPermissions()
9292
{
9393
this.portalRequest.setRawPath( "/admin/webapp/tool/1" );
9494
when( this.rawRequest.isUserInRole( Mockito.anyString() ) ).thenReturn( false );
9595
assertThrows( WebException.class, () -> this.handler.doHandle( this.portalRequest, this.webResponse, this.chain ) );
9696
}
9797

9898
@Test
99-
public void testWithNoDescriptor()
99+
void testWithNoDescriptor()
100100
{
101101
when( this.adminToolDescriptorService.getByKey( any( DescriptorKey.class ) ) ).thenReturn( null );
102102
this.portalRequest.setRawPath( "/admin/webapp/tool/1" );
103103
assertThrows( WebException.class, () -> this.handler.doHandle( this.portalRequest, this.webResponse, this.chain ) );
104104
}
105105

106106
@Test
107-
public void testWithNoAccessToApplication()
107+
void testWithNoAccessToApplication()
108108
{
109109
this.mockDescriptor( DescriptorKey.from( "app:tool" ), false );
110110
this.portalRequest.setRawPath( "/admin/webapp/tool/1" );
111111
assertThrows( WebException.class, () -> this.handler.doHandle( this.portalRequest, this.webResponse, this.chain ) );
112112
}
113113

114114
@Test
115-
public void test()
115+
void test()
116116
throws Exception
117117
{
118118
this.mockDescriptor( DescriptorKey.from( "app:tool" ), true );

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/AdminToolPortalHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.when;
2424

25-
public class AdminToolPortalHandlerTest
25+
class AdminToolPortalHandlerTest
2626
{
2727
private WebRequest request;
2828

@@ -33,7 +33,7 @@ public class AdminToolPortalHandlerTest
3333
private WebHandlerChain chain;
3434

3535
@BeforeEach
36-
public void setup()
36+
void setup()
3737
throws Exception
3838
{
3939
final ExceptionMapper exceptionMapper = mock( ExceptionMapper.class );

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetListAllowedWidgetsHandlerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import com.enonic.xp.admin.widget.WidgetDescriptor;
1717
import com.enonic.xp.admin.widget.WidgetDescriptorService;
1818
import com.enonic.xp.app.ApplicationKey;
19+
import com.enonic.xp.descriptor.DescriptorKey;
1920
import com.enonic.xp.descriptor.Descriptors;
2021
import com.enonic.xp.i18n.LocaleService;
2122
import com.enonic.xp.i18n.MessageBundle;
2223
import com.enonic.xp.icon.Icon;
23-
import com.enonic.xp.descriptor.DescriptorKey;
2424
import com.enonic.xp.portal.PortalRequest;
2525
import com.enonic.xp.web.WebResponse;
2626

@@ -34,7 +34,7 @@
3434
import static org.mockito.Mockito.mock;
3535
import static org.mockito.Mockito.when;
3636

37-
public class GetListAllowedWidgetsHandlerTest
37+
class GetListAllowedWidgetsHandlerTest
3838
{
3939
private WidgetDescriptorService widgetDescriptorService;
4040

‎modules/admin/admin-impl/src/test/java/com/enonic/xp/admin/impl/portal/widget/GetWidgetIconHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.when;
2222

23-
public class GetWidgetIconHandlerTest
23+
class GetWidgetIconHandlerTest
2424
{
2525
private GetWidgetIconHandler instance;
2626

0 commit comments

Comments
 (0)