Skip to content

Commit 336dd7a

Browse files
introfogyulian-gaponenko
authored andcommitted
Move utils from IO module to Events module
DEVSIX-5233 Autoported commit. Original commit hash: [5810fb557] Manual files: io/src/main/java/com/itextpdf/io/codec/Base64.java io/src/main/java/com/itextpdf/io/util/FileUtil.java io/src/main/java/com/itextpdf/io/util/SystemUtil.java events/src/test/java/com/itextpdf/events/utils/Base64Test.java io/src/test/java/com/itextpdf/io/util/SystemUtilTest.java io/src/test/java/com/itextpdf/io/util/UrlUtilTest.java kernel/src/main/java/com/itextpdf/kernel/counter/data/EventDataHandler.java sign/src/main/java/com/itextpdf/signatures/SignUtils.java sign/src/test/java/com/itextpdf/signatures/testutils/builder/TestTimestampTokenBuilder.java sign/src/test/java/com/itextpdf/signatures/testutils/cert/TestCertificateBuilder.java
1 parent f5fc1f1 commit 336dd7a

File tree

89 files changed

+87
-84
lines changed

Some content is hidden

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

89 files changed

+87
-84
lines changed

itext.tests/itext.io.tests/itext/io/util/FormattingStreamWriterUnitTest.cs renamed to itext.tests/itext.events.tests/itext/events/utils/FormattingStreamWriterUnitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You should have received a copy of the GNU Affero General Public License
2626
using System.Threading;
2727
using iText.Test;
2828

29-
namespace iText.IO.Util
29+
namespace iText.Events.Utils
3030
{
3131
public class FormattingStreamWriterUnitTest : ExtendedITextTest {
3232

itext.tests/itext.io.tests/itext/io/util/MapUtilTest.cs renamed to itext.tests/itext.events.tests/itext/events/utils/MapUtilTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using System.Collections.Generic;
25-
using iText.Events.Utils;
2625
using iText.Test;
2726

28-
namespace iText.IO.Util {
27+
namespace iText.Events.Utils {
2928
public class MapUtilTest : ExtendedITextTest {
3029
[NUnit.Framework.Test]
3130
public virtual void NullMapsAreEqualTest() {

itext.tests/itext.io.tests/itext/io/util/SystemUtilTest.cs renamed to itext.tests/itext.events.tests/itext/events/utils/SystemUtilTest.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@ source product.
4646
using System.Text;
4747
using iText.Test;
4848

49-
namespace iText.IO.Util {
49+
namespace iText.Events.Utils {
5050
public class SystemUtilTest : ExtendedITextTest {
51+
private const String MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY = "compareExec";
52+
private const String MAGICK_COMPARE_ENVIRONMENT_VARIABLE = "ITEXT_MAGICK_COMPARE_EXEC";
53+
5154
public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework
52-
.TestContext.CurrentContext.TestDirectory) + "/resources/itext/io/util/SystemUtilTest/";
55+
.TestContext.CurrentContext.TestDirectory) + "/resources/itext/events/utils/SystemUtilTest/";
5356

5457

5558
private static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
56-
+ "/test/itext/io/SystemUtilTest/";
59+
+ "/test/itext/events/utils/SystemUtilTest/";
5760

5861
// This is empty file that used to check the logic for existed execution file
5962
public static readonly String STUB_EXEC_FILE = SOURCE_FOLDER + "folder with space/stubFile";
@@ -136,9 +139,9 @@ public virtual void SplitIntoProcessArgumentsMagickCompareTest() {
136139

137140
[NUnit.Framework.Test]
138141
public virtual void RunProcessAndWaitWithWorkingDirectoryTest() {
139-
String imageMagickPath = SystemUtil.GetEnvironmentVariable(ImageMagickHelper.MAGICK_COMPARE_ENVIRONMENT_VARIABLE);
142+
String imageMagickPath = SystemUtil.GetEnvironmentVariable(MAGICK_COMPARE_ENVIRONMENT_VARIABLE);
140143
if (imageMagickPath == null) {
141-
imageMagickPath = SystemUtil.GetEnvironmentVariable(ImageMagickHelper.MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY);
144+
imageMagickPath = SystemUtil.GetEnvironmentVariable(MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY);
142145
}
143146
String inputImage = "image.jpg";
144147
String cmpImage = "cmp_image.jpg";

itext.tests/itext.io.tests/itext/io/source/RAFRandomAccessSourceTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ source product.
4242
*/
4343
using System;
4444
using System.IO;
45-
using iText.IO.Util;
45+
using iText.Events.Utils;
4646
using iText.Test;
4747

4848
namespace iText.IO.Source {

itext.tests/itext.io.tests/itext/io/util/GhostscriptHelperTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ source product.
4242
*/
4343
using System;
4444
using System.IO;
45+
using iText.Events.Utils;
4546
using iText.IO;
4647
using iText.Test;
4748

itext.tests/itext.io.tests/itext/io/util/ImageHandlerUtilTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ source product.
4242
*/
4343
using System;
4444
using System.IO;
45+
using iText.Events.Utils;
4546
using iText.Test;
4647

4748
namespace iText.IO.Util {

itext.tests/itext.io.tests/itext/io/util/ImageMagickHelperTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ source product.
4242
*/
4343
using System;
4444
using System.IO;
45+
using iText.Events.Utils;
4546
using iText.IO;
4647
using iText.Test;
4748

0 commit comments

Comments
 (0)