DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Align C# implementation with Java

Browse Source 
Summary:
- Align C# implementation with Java JNI implementation
  - No need to call init(reinit)
  - Rename Initialize and Reset
- Add unittests

Reviewed By: emilsjolander

Differential Revision: D4009351

fbshipit-source-id: 191ddec30b0c8518eb0d76c0579afe909b673fac
This commit is contained in:
Kazuki Sakamoto
2016-10-13 07:52:44 -07:00
committed by Facebook Github Bot
parent 2a8a4e10c6
commit 722bfb9032
3 changed files with 108 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -77,7 +77,6 @@ root.setStyleHeight(100);
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
CSSNode child = new CSSNode(); CSSNode child = new CSSNode();
child.init();
child.setStyleHeight(10); child.setStyleHeight(10);
root.addChildAt(child, 0); root.addChildAt(child, 0);
} }
@@ -116,14 +115,12 @@ The full API can be found in `csharp/Facebook.CSSLayout/CSSNode.cs`.
```csharp ```csharp
var root = new CSSNode(); var root = new CSSNode();
root.Initialize();
root.StyleWidth = 100; root.StyleWidth = 100;
root.StyleHeight = 100; root.StyleHeight = 100;
for (var i = 0; i < 10; i++) for (var i = 0; i < 10; i++)
{ {
var child = new CSSNode(); var child = new CSSNode();
child.Initialize();
child.StyleHeight = 10; child.StyleHeight = 10;
root.Insert(0, child); root.Insert(0, child);
} }

32
csharp/Facebook.CSSLayout/CSSNode.cs
View File

@@ -30,6 +30,7 @@ namespace Facebook.CSSLayout
{ {
_measureFunc = MeasureInternal; _measureFunc = MeasureInternal;
_printFunc = PrintInternal; _printFunc = PrintInternal;
Reinitialize();
} }
private void AssertNativeInstance() private void AssertNativeInstance()
@@ -72,8 +73,27 @@ namespace Facebook.CSSLayout
private void FreeManaged() private void FreeManaged()
{ {
_children = null; if (_children != null)
_parent = null; {
for (int i = 0; i < _children.Count; ++i)
{
var child = _children[i];
child.AssertNativeInstance();
child._parent = null;
Native.CSSNodeRemoveChild(_cssNode, child._cssNode);
}
_children = null;
}
if (_parent != null)
{
var parent = _parent.Target as CSSNode;
parent.AssertNativeInstance();
parent._children.Remove(this);
Native.CSSNodeRemoveChild(parent._cssNode, _cssNode);
_parent = null;
}
_measureFunction = null; _measureFunction = null;
} }
@@ -86,7 +106,7 @@ namespace Facebook.CSSLayout
} }
} }
public void Initialize() public void Reinitialize()
{ {
if (_cssNode != IntPtr.Zero) if (_cssNode != IntPtr.Zero)
{ {
@@ -99,9 +119,13 @@ namespace Facebook.CSSLayout
Native.CSSNodeSetPrintFunc(_cssNode, _printFunc); Native.CSSNodeSetPrintFunc(_cssNode, _printFunc);
} }
public void Reset() public void Free()
{ {
AssertNativeInstance(); AssertNativeInstance();
if (_parent != null || (_children != null && _children.Count > 0))
{
throw new InvalidOperationException("You should not free an attached CSSNode");
}
FreeManaged(); FreeManaged();
FreeUnmanaged(); FreeUnmanaged();
} }

104
csharp/tests/Facebook.CSSLayout/CSSNodeTest.cs
View File

@@ -22,9 +22,7 @@ namespace Facebook.CSSLayout
public void TestAddChildGetParent() public void TestAddChildGetParent()
{ {
CSSNode parent = new CSSNode(); CSSNode parent = new CSSNode();
parent.Initialize();
CSSNode child = new CSSNode(); CSSNode child = new CSSNode();
child.Initialize();
Assert.IsNull(child.Parent); Assert.IsNull(child.Parent);
Assert.AreEqual(0, parent.Count); Assert.AreEqual(0, parent.Count);
@@ -46,11 +44,8 @@ namespace Facebook.CSSLayout
public void TestCannotAddChildToMultipleParents() public void TestCannotAddChildToMultipleParents()
{ {
CSSNode parent1 = new CSSNode(); CSSNode parent1 = new CSSNode();
parent1.Initialize();
CSSNode parent2 = new CSSNode(); CSSNode parent2 = new CSSNode();
parent2.Initialize();
CSSNode child = new CSSNode(); CSSNode child = new CSSNode();
child.Initialize();
parent1.Insert(0, child); parent1.Insert(0, child);
parent2.Insert(0, child); parent2.Insert(0, child);
@@ -61,8 +56,7 @@ namespace Facebook.CSSLayout
public void TestAlreadyInitialize() public void TestAlreadyInitialize()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
node.Initialize(); node.Reinitialize();
node.Initialize();
} }
[Test] [Test]
@@ -70,15 +64,25 @@ namespace Facebook.CSSLayout
public void TestNullNativePointer() public void TestNullNativePointer()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
node.Free();
node.CalculateLayout(); node.CalculateLayout();
} }
[Test] [Test]
[ExpectedException("System.InvalidOperationException")] [ExpectedException("System.InvalidOperationException")]
public void TestNullNativePointerWithReset() public void TestDoubleFree()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
node.Reset(); node.Free();
node.Free();
}
[Test]
public void TestReinitialize()
{
CSSNode node = new CSSNode();
node.Free();
node.Reinitialize();
} }
[Test] [Test]
@@ -86,18 +90,15 @@ namespace Facebook.CSSLayout
public void TestDisposed() public void TestDisposed()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
node.Initialize();
node.Dispose(); node.Dispose();
node.CalculateLayout(); node.CalculateLayout();
} }
[Test] [Test]
public void TestReset() public void TestFree()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
node.Initialize(); node.Free();
node.Reset();
node.Initialize();
} }
[Test] [Test]
@@ -106,8 +107,6 @@ namespace Facebook.CSSLayout
ForceGC(); ForceGC();
Assert.AreEqual(0, CSSNode.GetInstanceCount()); Assert.AreEqual(0, CSSNode.GetInstanceCount());
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
Assert.AreEqual(0, CSSNode.GetInstanceCount());
node.Initialize();
Assert.AreEqual(1, CSSNode.GetInstanceCount()); Assert.AreEqual(1, CSSNode.GetInstanceCount());
node.Dispose(); node.Dispose();
Assert.AreEqual(0, CSSNode.GetInstanceCount()); Assert.AreEqual(0, CSSNode.GetInstanceCount());
@@ -120,8 +119,6 @@ namespace Facebook.CSSLayout
Assert.AreEqual(0, CSSNode.GetInstanceCount()); Assert.AreEqual(0, CSSNode.GetInstanceCount());
using (CSSNode node = new CSSNode()) using (CSSNode node = new CSSNode())
{ {
Assert.AreEqual(0, CSSNode.GetInstanceCount());
node.Initialize();
Assert.AreEqual(1, CSSNode.GetInstanceCount()); Assert.AreEqual(1, CSSNode.GetInstanceCount());
} }
Assert.AreEqual(0, CSSNode.GetInstanceCount()); Assert.AreEqual(0, CSSNode.GetInstanceCount());
@@ -140,8 +137,7 @@ namespace Facebook.CSSLayout
private void TestDestructorForGC() private void TestDestructorForGC()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
Assert.AreEqual(0, CSSNode.GetInstanceCount()); Assert.IsNotNull(node);
node.Initialize();
Assert.AreEqual(1, CSSNode.GetInstanceCount()); Assert.AreEqual(1, CSSNode.GetInstanceCount());
node = null; node = null;
} }
@@ -159,8 +155,6 @@ namespace Facebook.CSSLayout
private void TestDestructorWithChildrenForGC1() private void TestDestructorWithChildrenForGC1()
{ {
CSSNode node = new CSSNode(); CSSNode node = new CSSNode();
Assert.AreEqual(0, CSSNode.GetInstanceCount());
node.Initialize();
Assert.AreEqual(1, CSSNode.GetInstanceCount()); Assert.AreEqual(1, CSSNode.GetInstanceCount());
TestDestructorWithChildrenForGC2(node, 1); TestDestructorWithChildrenForGC2(node, 1);
@@ -177,14 +171,76 @@ namespace Facebook.CSSLayout
private void TestDestructorWithChildrenForGC2(CSSNode parent, int count) private void TestDestructorWithChildrenForGC2(CSSNode parent, int count)
{ {
CSSNode child = new CSSNode(); CSSNode child = new CSSNode();
Assert.AreEqual(count, CSSNode.GetInstanceCount());
child.Initialize();
Assert.AreEqual(count + 1, CSSNode.GetInstanceCount()); Assert.AreEqual(count + 1, CSSNode.GetInstanceCount());
parent.Insert(0, child); parent.Insert(0, child);
child = null; child = null;
} }
[Test]
[ExpectedException("System.InvalidOperationException")]
public void TestFreeParent()
{
CSSNode parent = new CSSNode();
CSSNode child = new CSSNode();
parent.Insert(0, child);
parent.Free();
}
[Test]
[ExpectedException("System.InvalidOperationException")]
public void TestFreeChild()
{
CSSNode parent = new CSSNode();
CSSNode child = new CSSNode();
parent.Insert(0, child);
child.Free();
}
[Test]
public void TestDisposeParent()
{
ForceGC();
Assert.AreEqual(0, CSSNode.GetInstanceCount());
CSSNode parent = new CSSNode();
Assert.AreEqual(1, CSSNode.GetInstanceCount());
TestDisposeParentForGC(parent);
ForceGC();
Assert.AreEqual(2, CSSNode.GetInstanceCount());
parent.Dispose();
ForceGC();
Assert.AreEqual(0, CSSNode.GetInstanceCount());
}
private void TestDisposeParentForGC(CSSNode parent)
{
CSSNode child = new CSSNode();
Assert.AreEqual(2, CSSNode.GetInstanceCount());
parent.Insert(0, child);
child = null;
}
[Test]
public void TestDisposeChild()
{
ForceGC();
Assert.AreEqual(0, CSSNode.GetInstanceCount());
CSSNode parent = new CSSNode();
CSSNode child0 = new CSSNode();
CSSNode child1 = new CSSNode();
Assert.AreEqual(3, CSSNode.GetInstanceCount());
Assert.AreEqual(0, parent.Count);
parent.Insert(0, child1);
Assert.AreEqual(0, parent.IndexOf(child1));
parent.Insert(0, child0);
Assert.AreEqual(0, parent.IndexOf(child0));
Assert.AreEqual(1, parent.IndexOf(child1));
child0.Dispose();
Assert.AreEqual(2, CSSNode.GetInstanceCount());
Assert.AreEqual(1, parent.Count);
Assert.AreEqual(0, parent.IndexOf(child1));
}
private void ForceGC() private void ForceGC()
{ {
GC.Collect(GC.MaxGeneration); GC.Collect(GC.MaxGeneration);