Skip to content

Commit

Permalink
Merge branch 'develop' into devsecops
Browse files Browse the repository at this point in the history
  • Loading branch information
@aleks-ivanov
aleks-ivanov committed Jun 22, 2024
2 parents f43b1f0 + 8d784f7 commit 00d289c
Show file tree
Hide file tree
Showing 91 changed files with 1,913 additions and 709 deletions.
2 changes: 1 addition & 1 deletion doxyfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ EXTRACT_PRIV_VIRTUAL = NO
# scope will be included in the documentation.
# The default value is: NO.

EXTRACT_PACKAGE = NO
EXTRACT_PACKAGE = YES

# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
# included in the documentation.
Expand Down
284 changes: 196 additions & 88 deletions itext.tests/itext.layout.tests/itext/layout/element/GridContainerTest.cs
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions itext.tests/itext.layout.tests/itext/layout/element/gridcontainer/GridContainerLayoutTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ You should have received a copy of the GNU Affero General Public License
using iText.Layout.Element;
using iText.Layout.Logs;
using iText.Layout.Properties;
using iText.Layout.Properties.Grid;
using iText.Test;
using iText.Test.Attributes;

Expand Down Expand Up @@ -148,8 +149,8 @@ public virtual void EmptyGridContainerTest() {
GridContainer gridcontainer0 = new GridContainer();
gridcontainer0.SetProperty(Property.COLUMN_GAP_BORDER, null);
gridcontainer0.SetBackgroundColor(ColorConstants.RED);
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_COLUMNS, JavaUtil.ArraysAsList(GridValue.CreatePointValue
(150.0f), GridValue.CreatePointValue(150.0f), GridValue.CreatePointValue(150.0f)));
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_COLUMNS, JavaUtil.ArraysAsList((TemplateValue)new PointValue
(150.0f), (TemplateValue)new PointValue(150.0f), (TemplateValue)new PointValue(150.0f)));
gridcontainer0.SetProperty(Property.COLUMN_GAP, 12.0f);
document.Add(gridcontainer0);
document.Close();
Expand All @@ -164,8 +165,8 @@ public virtual void OverflowGridContainerTest() {
Document document = new Document(pdfDocument);
GridContainer gridcontainer0 = CreateGridBoxWithText();
gridcontainer0.SetBackgroundColor(ColorConstants.MAGENTA);
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_ROWS, JavaUtil.ArraysAsList(GridValue.CreatePointValue(500.0f
), GridValue.CreatePointValue(500.0f), GridValue.CreatePointValue(500.0f)));
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_ROWS, JavaUtil.ArraysAsList((TemplateValue)new PointValue
(500.0f), (TemplateValue)new PointValue(500.0f), (TemplateValue)new PointValue(500.0f)));
gridcontainer0.Add(new iText.Layout.Element.Image(ImageDataFactory.Create(SOURCE_FOLDER + "rock_texture.jpg"
)).SetHeight(150));
document.Add(gridcontainer0);
Expand All @@ -192,8 +193,8 @@ public virtual void NothingResultTest() {
private GridContainer CreateGridBoxWithText() {
GridContainer gridcontainer0 = new GridContainer();
gridcontainer0.SetProperty(Property.COLUMN_GAP_BORDER, null);
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_COLUMNS, JavaUtil.ArraysAsList(GridValue.CreatePointValue
(150.0f), GridValue.CreatePointValue(150.0f), GridValue.CreatePointValue(150.0f)));
gridcontainer0.SetProperty(Property.GRID_TEMPLATE_COLUMNS, JavaUtil.ArraysAsList((TemplateValue)new PointValue
(150.0f), (TemplateValue)new PointValue(150.0f), (TemplateValue)new PointValue(150.0f)));
gridcontainer0.SetProperty(Property.COLUMN_GAP, 12.0f);
Div div1 = new Div();
div1.SetBackgroundColor(ColorConstants.YELLOW);
Expand Down
53 changes: 35 additions & 18 deletions itext.tests/itext.layout.tests/itext/layout/properties/GridValueTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,60 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
using iText.Layout.Properties.Grid;
using iText.Test;

namespace iText.Layout.Properties {
[NUnit.Framework.Category("UnitTest")]
public class GridValueTest : ExtendedITextTest {
[NUnit.Framework.Test]
public virtual void UnitValueTest() {
GridValue value = GridValue.CreatePointValue(3.2f);
NUnit.Framework.Assert.IsTrue(value.IsPointValue());
NUnit.Framework.Assert.AreEqual(3.2f, value.GetValue(), 0.00001);
value = GridValue.CreatePercentValue(30f);
NUnit.Framework.Assert.IsTrue(value.IsPercentValue());
NUnit.Framework.Assert.AreEqual(30, value.GetValue(), 0.00001);
LengthValue value = new PointValue(3.2f);
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.POINT);
NUnit.Framework.Assert.AreEqual(3.2f, (float)value.GetValue(), 0.00001);
value = new PercentValue(30f);
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.PERCENT);
NUnit.Framework.Assert.AreEqual(30, (float)value.GetValue(), 0.00001);
}

[NUnit.Framework.Test]
public virtual void MinMaxContentTest() {
GridValue value = GridValue.CreateMinContentValue();
NUnit.Framework.Assert.IsTrue(value.IsMinContentValue());
NUnit.Framework.Assert.IsNull(value.GetValue());
value = GridValue.CreateMaxContentValue();
NUnit.Framework.Assert.IsTrue(value.IsMaxContentValue());
NUnit.Framework.Assert.IsNull(value.GetValue());
GridValue value = MinContentValue.VALUE;
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.MIN_CONTENT);
value = MaxContentValue.VALUE;
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.MAX_CONTENT);
}

[NUnit.Framework.Test]
public virtual void AutoTest() {
GridValue value = GridValue.CreateAutoValue();
NUnit.Framework.Assert.IsTrue(value.IsAutoValue());
NUnit.Framework.Assert.IsNull(value.GetValue());
GridValue value = AutoValue.VALUE;
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.AUTO);
}

[NUnit.Framework.Test]
public virtual void FlexValueTest() {
GridValue value = GridValue.CreateFlexValue(1.5f);
NUnit.Framework.Assert.IsTrue(value.IsFlexibleValue());
NUnit.Framework.Assert.AreEqual(1.5f, (float)value.GetValue(), 0.00001);
FlexValue value = new FlexValue(1.5f);
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.FLEX);
NUnit.Framework.Assert.AreEqual(1.5f, (float)value.GetFlex(), 0.00001);
}

[NUnit.Framework.Test]
public virtual void FitContentTest() {
FitContentValue value = new FitContentValue(new PointValue(50.0f));
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.FIT_CONTENT);
NUnit.Framework.Assert.AreEqual(new PointValue(50.0f).GetValue(), value.GetLength().GetValue(), 0.00001);
value = new FitContentValue(UnitValue.CreatePercentValue(20.0f));
NUnit.Framework.Assert.AreEqual(new PercentValue(20.0f).GetValue(), value.GetLength().GetValue(), 0.00001);
}

[NUnit.Framework.Test]
public virtual void MinMaxTest() {
MinMaxValue value = new MinMaxValue(new PointValue(50.0f), new FlexValue(2.0f));
NUnit.Framework.Assert.AreEqual(value.GetType(), TemplateValue.ValueType.MINMAX);
NUnit.Framework.Assert.AreEqual(new PointValue(50.0f).GetValue(), ((PointValue)value.GetMin()).GetValue(),
0.00001);
NUnit.Framework.Assert.AreEqual(new FlexValue(2.0f).GetFlex(), ((FlexValue)value.GetMax()).GetFlex(), 0.00001
);
}
}
}
Loading

0 comments on commit 00d289c

Please sign in to comment.