Skip to content

Commit 17ebcb6

Browse files
author
Sergiy Zhovnir
committed
#issue-203-204 Fixing static tests
1 parent c7e925e commit 17ebcb6

File tree

2 files changed

+45
-6
lines changed

2 files changed

+45
-6
lines changed

tests/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGeneratorTest.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
@@ -15,8 +15,10 @@ public class PreferenceClassGeneratorTest extends BaseGeneratorTestCase {
1515
private static final String targetSimpleModelOneClassFqn = "Foo\\Bar\\Model\\SimpleModelOne";
1616
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
1717

18-
public void testGeneratePreferenceClassFile()
19-
{
18+
/**
19+
* Test preference class file generation
20+
*/
21+
public void testGeneratePreferenceClassFile() {
2022
PsiFile preferenceClassFile = createPreferenceClassFile(
2123
targetSimpleModelOneClassFqn,
2224
"Model/Override",
@@ -35,8 +37,10 @@ public void testGeneratePreferenceClassFile()
3537
);
3638
}
3739

38-
public void testGeneratePreferenceClassFileWithInheritance()
39-
{
40+
/**
41+
* Test preference class file generation with inheritance
42+
*/
43+
public void testGeneratePreferenceClassFileWithInheritance() {
4044
PsiFile preferenceClassFile = createPreferenceClassFile(
4145
targetSimpleModelTwoClassFqn,
4246
"Model/Override",
@@ -55,6 +59,17 @@ public void testGeneratePreferenceClassFileWithInheritance()
5559
);
5660
}
5761

62+
/**
63+
* Create preference class file
64+
*
65+
* @param targetClassFnq Target Class FQN
66+
* @param preferenceDirectory Preference Directory
67+
* @param preferenceClassName Preference Class Name
68+
* @param preferenceFqn Preference FQN
69+
* @param namespace Namespace
70+
* @param inheritClass Inherit target class
71+
* @return PsiFile
72+
*/
5873
private PsiFile createPreferenceClassFile(
5974
String targetClassFnq,
6075
String preferenceDirectory,

tests/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceDiXmlGeneratorTest.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
@@ -19,6 +19,9 @@ public class PreferenceDiXmlGeneratorTest extends BaseGeneratorTestCase {
1919
private static final String targetSimpleModelOneClassFqn = "Foo\\Bar\\Model\\SimpleModelOne";
2020
private static final String targetSimpleModelTwoClassFqn = "Foo\\Bar\\Model\\SimpleModelTwo";
2121

22+
/**
23+
* Test preference DI XML file generation
24+
*/
2225
public void testGeneratePreferenceDiXml()
2326
{
2427
String area = Package.Areas.base.toString();
@@ -39,6 +42,9 @@ public void testGeneratePreferenceDiXml()
3942
);
4043
}
4144

45+
/**
46+
* Test preference DI XML file generation for adminhtml area
47+
*/
4248
public void testGeneratePreferenceDiXmlForAdminhtmlArea()
4349
{
4450
String area = Package.Areas.adminhtml.toString();
@@ -59,6 +65,9 @@ public void testGeneratePreferenceDiXmlForAdminhtmlArea()
5965
);
6066
}
6167

68+
/**
69+
* Test the adding of two preferences to one DI XML file
70+
*/
6271
public void testAddTwoPreferencesToOneDiXmlFile()
6372
{
6473
String area = Package.Areas.frontend.toString();
@@ -85,6 +94,15 @@ public void testAddTwoPreferencesToOneDiXmlFile()
8594
);
8695
}
8796

97+
/**
98+
* Add preference to XML file
99+
*
100+
* @param targetClassFnq Target class FQN
101+
* @param preferenceFqn Preference FQN
102+
* @param area Area
103+
* @param namespace Namespace
104+
* @return PsiFile
105+
*/
88106
private PsiFile addPreferenceDiXml(
89107
String targetClassFnq,
90108
String preferenceFqn,
@@ -105,6 +123,12 @@ private PsiFile addPreferenceDiXml(
105123
return moduleXmlGenerator.generate("test");
106124
}
107125

126+
/**
127+
* Get expected directory based on provided area
128+
*
129+
* @param area Area name
130+
* @return String
131+
*/
108132
private String getExpectedDirectory(String area)
109133
{
110134
if (area.equals(Package.Areas.base.toString())) {

0 commit comments

Comments
 (0)