Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test PBIX file, refactor unit tests #12

Merged
merged 6 commits into from
Mar 1, 2024
Merged

Add test PBIX file, refactor unit tests #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
628affa
Add ObfuscatorTest PBIX
albertospelta Mar 1, 2024
58f08e3
Refactor rename vars/methods in unit test
albertospelta Mar 1, 2024
ec2a6bc
Fix fully qualified extension column name obfuscation
albertospelta Mar 1, 2024
646c2f0
Reactor, rename unit test methods
albertospelta Mar 1, 2024
8862ac9
Revert "Fix fully qualified extension column name obfuscation"
albertospelta Mar 1, 2024
d618fda
Update unit test and PBIX
albertospelta Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/ObfuscatorTest.pbix
View file
Open in desktop
Binary file not shown.
47 changes: 20 additions & 27 deletions tests/Dax.Vpax.Obfuscator.Tests/DaxModelDeobfuscatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq.Expressions;
using Dax.Metadata;
using Dax.Metadata;
using Dax.Vpax.Obfuscator.Common;
using Dax.Vpax.Obfuscator.Tests.TestUtils;
using Dax.Tokenizer;
using Xunit;

namespace Dax.Vpax.Obfuscator.Tests;
Expand Down Expand Up @@ -51,8 +47,8 @@ public void DeobfuscateExpression_CalendarDateColumn_IsNotDeobfuscatedBecauseItI
[Fact]
public void DeobfuscateExpression_TableConstructorColumnName_IsNotDeobfuscatedBecauseItIsNotObfuscated_SingleColumnTest()
{
var expression = """ SELECTCOLUMNS({ (0) }, "XXX", [Value]) """;
var expected = """ SELECTCOLUMNS({ (0) }, "@c1", [Value]) """;
var expression = """ SELECTCOLUMNS({0}, "XXX", [Value]) """;
var expected = """ SELECTCOLUMNS({0}, "@c1", [Value]) """;

var (_, _, deobfuscator) = CreateTest(
[
Expand All @@ -66,8 +62,8 @@ public void DeobfuscateExpression_TableConstructorColumnName_IsNotDeobfuscatedBe
[Fact]
public void DeobfuscateExpression_TableConstructorColumnName_IsNotDeobfuscatedBecauseItIsNotObfuscated_MultipleColumnsTest()
{
var expression = """ SELECTCOLUMNS({ (1,2,3) }, "XXX", [Value1], "YYY", [value2], "ZZZ", [VALUE3]) """;
var expected = """ SELECTCOLUMNS({ (1,2,3) }, "@c1", [Value1], "@c2", [value2], "@c3", [VALUE3]) """;
var expression = """ SELECTCOLUMNS({(1,2,3)}, "XXX", [Value1], "YYY", [value2], "ZZZ", [VALUE3]) """;
var expected = """ SELECTCOLUMNS({(1,2,3)}, "@c1", [Value1], "@c2", [value2], "@c3", [VALUE3]) """;

var (_, _, deobfuscator) = CreateTest(
[
Expand All @@ -81,14 +77,13 @@ public void DeobfuscateExpression_TableConstructorColumnName_IsNotDeobfuscatedBe
}

[Fact]
public void DeobfuscateExpression_ExtensionColumnNameWithDifferentCasings_ReturnsSameDeobfuscatedValue()
public void DeobfuscateExpression_ExtensionColumnNameMultipleReferencesWithDifferentCasings_ReturnsSameDeobfuscatedValue()
{
var expression = """ SUMX(ADDCOLUMNS(Date, "XXXXXXX", 1), [XXXXXXX]) """;
var expected = """ SUMX(ADDCOLUMNS(Date, "@column", 1), [@COLUMN]) """;
var expression = """ SUMX(ADDCOLUMNS({}, "XXXXXXX", 1), [XXXXXXX]) """;
var expected = """ SUMX(ADDCOLUMNS({}, "@column", 1), [@COLUMN]) """;

var (_, _, deobfuscator) = CreateTest(
[
new ObfuscationText("Date", "Date"),
new ObfuscationText("@column", "XXXXXXX"),
]);
var actual = deobfuscator.DeobfuscateExpression(expression);
Expand All @@ -97,15 +92,14 @@ public void DeobfuscateExpression_ExtensionColumnNameWithDifferentCasings_Return
}

[Fact]
public void DeobfuscateExpression_ExtensionColumnName_ReturnsDeobfuscatedTableNameAndColumnNameParts()
public void DeobfuscateExpression_ExtensionColumnNameFullyQualified_ReturnsDeobfuscatedColumnNameParts()
{
var expression = """ SUMX(ADDCOLUMNS(Date, "XXXXXX[Y]", 1), XXXXXX[Y]) """;
var expected = """ SUMX(ADDCOLUMNS(Date, "__rate[%]", 1), __rate[%]) """;
var expression = """ SUMX(ADDCOLUMNS({}, "XXXX[Y]", 1), XXXX[Y]) """;
var expected = """ SUMX(ADDCOLUMNS({}, "rate[%]", 1), rate[%]) """;

var (_, _, deobfuscator) = CreateTest(
[
new ObfuscationText("Date", "Date"),
new ObfuscationText("__rate", "XXXXXX"),
new ObfuscationText("rate", "XXXX"),
new ObfuscationText("%", "Y"),
]);
var actual = deobfuscator.DeobfuscateExpression(expression);
Expand All @@ -114,14 +108,13 @@ public void DeobfuscateExpression_ExtensionColumnName_ReturnsDeobfuscatedTableNa
}

[Fact]
public void DeobfuscateExpression_ExtensionColumnName_ReturnsDeobfuscatedValuePreservingEscapeChar()
public void DeobfuscateExpression_ExtensionColumnNameFullyQualified_ReturnsDeobfuscatedColumnNamePartsPreservingQuotationMarkEscapeChar()
{
var expression = """ SELECTCOLUMNS(ADDCOLUMNS(Date, "XXX[Y""Y]", 1), XXX[Y"Y]) """;
var expected = """ SELECTCOLUMNS(ADDCOLUMNS(Date, "aaa[b""c]", 1), aaa[b"c]) """;
var expression = """ SELECTCOLUMNS(ADDCOLUMNS({}, "XXX[Y""Y]", 1), XXX[Y"Y]) """;
var expected = """ SELECTCOLUMNS(ADDCOLUMNS({}, "aaa[b""c]", 1), aaa[b"c]) """;

var (_, _, deobfuscator) = CreateTest(
[
new ObfuscationText("Date", "Date"),
new ObfuscationText("aaa", "XXX"),
new ObfuscationText("b\"c", "Y\"Y"),
]);
Expand All @@ -131,7 +124,7 @@ public void DeobfuscateExpression_ExtensionColumnName_ReturnsDeobfuscatedValuePr
}

[Fact]
public void DeobfuscateExpression_TableNameWithDifferentCasings_ReturnsSameDeobfuscatedValue()
public void DeobfuscateExpression_TableNameMultipleReferencesWithDifferentCasings_ReturnsSameDeobfuscatedValue()
{
var expression = "COUNTROWS('XXXXX') + COUNTROWS(XXXXX) + COUNTROWS(XXXXX) + COUNTROWS(XXXXX)";
var expected = "COUNTROWS('Sales') + COUNTROWS(sales) + COUNTROWS(SALES) + COUNTROWS(SaLeS)";
Expand All @@ -146,7 +139,7 @@ public void DeobfuscateExpression_TableNameWithDifferentCasings_ReturnsSameDeobf
}

[Fact]
public void DeobfuscateExpression_ColumnNameWithEscapeSquareBracket_ReturnsDeobfuscatedValuePreservingEscapeChar()
public void DeobfuscateExpression_ColumnName_ReturnsDeobfuscatedValuePreservingSquareBracketEscapeChar()
{
var expression = "RELATED( XXXXX[YYYYYY]]] )";
var expected = "RELATED( Sales[Rate[%]]] )";
Expand All @@ -162,7 +155,7 @@ public void DeobfuscateExpression_ColumnNameWithEscapeSquareBracket_ReturnsDeobf
}

[Fact]
public void DeobfuscateExpression_VariableNameWithDifferentCasings_ReturnsSameDeobfuscatedValue()
public void DeobfuscateExpression_VariableNameMultipleReferencesWithDifferentCasings_ReturnsSameDeobfuscatedValue()
{
var expression = "VAR XXXXXX = 1 RETURN XXXXXX + XXXXXX + XXXXXX";
var expected = "VAR Amount = 1 RETURN AMOUNT + AmOuNt + amount";
Expand All @@ -179,8 +172,8 @@ public void DeobfuscateExpression_VariableNameWithDifferentCasings_ReturnsSameDe
[Fact]
public void ObfuscateExpression_ValueExtensionColumnName_IsNotObfuscated()
{
var expression = """ SELECTCOLUMNS ( { 1 }, "XXXXXXXXXX", ''[Value]) """;
var expected = """ SELECTCOLUMNS ( { 1 }, "__Measures", ''[Value]) """;
var expression = """ SELECTCOLUMNS({0}, "XXXXXXXXXX", ''[Value]) """;
var expected = """ SELECTCOLUMNS({0}, "__Measures", ''[Value]) """;

var (_, _, deobfuscator) = CreateTest(
[
Expand Down
36 changes: 18 additions & 18 deletions tests/Dax.Vpax.Obfuscator.Tests/DaxModelObfuscatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public void ObfuscateExpression_CalendarDateColumn_IsNotObfuscated()
[Fact]
public void ObfuscateExpression_TableConstructorColumnName_IsNotObfuscated_SingleColumnTest()
{
var expression = """ SELECTCOLUMNS({ (0) }, "@c1", [Value]) """;
var expected = """ SELECTCOLUMNS({ (0) }, "XXX", [Value]) """;
var expression = """ SELECTCOLUMNS({0}, "@c1", [Value]) """;
var expected = """ SELECTCOLUMNS({0}, "XXX", [Value]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("@c1", "XXX"));
Expand All @@ -55,8 +55,8 @@ public void ObfuscateExpression_TableConstructorColumnName_IsNotObfuscated_Singl
[Fact]
public void ObfuscateExpression_TableConstructorColumnName_IsNotObfuscated_MultipleColumnsTest()
{
var expression = """ SELECTCOLUMNS({ (1,2,3) }, "@c1", [Value1], "@c2", [value2], "@c3", [VALUE3]) """;
var expected = """ SELECTCOLUMNS({ (1,2,3) }, "XXX", [Value1], "YYY", [value2], "ZZZ", [VALUE3]) """;
var expression = """ SELECTCOLUMNS({(1,2,3)}, "@c1", [Value1], "@c2", [value2], "@c3", [VALUE3]) """;
var expected = """ SELECTCOLUMNS({(1,2,3)}, "XXX", [Value1], "YYY", [value2], "ZZZ", [VALUE3]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("@c1", "XXX"));
Expand All @@ -68,10 +68,10 @@ public void ObfuscateExpression_TableConstructorColumnName_IsNotObfuscated_Multi
}

[Fact]
public void ObfuscateExpression_ExtensionColumnNameWithDifferentCasings_ReturnsSameObfuscatedValue()
public void ObfuscateExpression_ExtensionColumnNameMultipleReferencesWithDifferentCasings_ReturnsSameObfuscatedValue()
{
var expression = """ SUMX(ADDCOLUMNS(Date, "@column", 1), [@COLUMN]) """;
var expected = """ SUMX(ADDCOLUMNS(Date, "XXXXXXX", 1), [XXXXXXX]) """;
var expression = """ SUMX(ADDCOLUMNS({}, "@column", 1), [@COLUMN]) """;
var expected = """ SUMX(ADDCOLUMNS({}, "XXXXXXX", 1), [XXXXXXX]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("@column", "XXXXXXX"));
Expand All @@ -81,24 +81,24 @@ public void ObfuscateExpression_ExtensionColumnNameWithDifferentCasings_ReturnsS
}

[Fact]
public void ObfuscateExpression_ExtensionColumnName_ReturnsObfuscatedTableNameAndColumnNameParts()
public void ObfuscateExpression_ExtensionColumnNameFullyQualified_ReturnsObfuscatedColumnNameParts()
{
var expression = """ SUMX(ADDCOLUMNS(Date, "__rate[%]", 1), __rate[%]) """;
var expected = """ SUMX(ADDCOLUMNS(Date, "XXXXXX[Y]", 1), XXXXXX[Y]) """;
var expression = """ SUMX(ADDCOLUMNS({}, "rate[%]", 1), rate[%]) """;
var expected = """ SUMX(ADDCOLUMNS({}, "XXXX[Y]", 1), XXXX[Y]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("__rate", "XXXXXX"));
obfuscator.Texts.Add(new DaxText("rate", "XXXX"));
obfuscator.Texts.Add(new DaxText("%", "Y"));
var actual = obfuscator.ObfuscateExpression(expression);

Assert.Equal(expected, actual);
}

[Fact]
public void ObfuscateExpression_ExtensionColumnName_ReturnsObfuscatedValuePreservingEscapeChar()
public void ObfuscateExpression_ExtensionColumnNameFullyQualified_ReturnsObfuscatedColumnNamePartsPreservingQuotationMarkEscapeChar()
{
var expression = """ SELECTCOLUMNS(ADDCOLUMNS(Date, "aaa[b""c]", 1), aaa[b"c]) """;
var expected = """ SELECTCOLUMNS(ADDCOLUMNS(Date, "XXX[Y""Y]", 1), XXX[Y"Y]) """;
var expression = """ SELECTCOLUMNS(ADDCOLUMNS({}, "aaa[b""c]", 1), aaa[b"c]) """;
var expected = """ SELECTCOLUMNS(ADDCOLUMNS({}, "XXX[Y""Y]", 1), XXX[Y"Y]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("aaa", "XXX"));
Expand All @@ -122,7 +122,7 @@ public void ObfuscateExpression_TableNameWithDifferentCasings_ReturnsSameObfusca
}

[Fact]
public void ObfuscateExpression_ColumnNameWithEscapeSquareBracket_ReturnsObfuscatedValuePreservingEscapeChar()
public void ObfuscateExpression_ColumnName_ReturnsObfuscatedValuePreservingSquareBracketEscapeChar()
{
var expression = "RELATED( Sales[Rate[%]]] )";
var expected = "RELATED( XXXXX[YYYYYY]]] )";
Expand All @@ -136,7 +136,7 @@ public void ObfuscateExpression_ColumnNameWithEscapeSquareBracket_ReturnsObfusca
}

[Fact]
public void ObfuscateExpression_VariableNameWithDifferentCasings_ReturnsSameObfuscatedValue()
public void ObfuscateExpression_VariableNameMultipleReferencesWithDifferentCasings_ReturnsSameObfuscatedValue()
{
var expression = "VAR Amount = 1 RETURN AMOUNT + AmOuNt + amount";
var expected = "VAR XXXXXX = 1 RETURN XXXXXX + XXXXXX + XXXXXX";
Expand All @@ -151,8 +151,8 @@ public void ObfuscateExpression_VariableNameWithDifferentCasings_ReturnsSameObfu
[Fact]
public void ObfuscateExpression_ValueExtensionColumnName_IsNotObfuscated()
{
var expression = """ SELECTCOLUMNS ( { 1 }, "__Measures", ''[Value]) """;
var expected = """ SELECTCOLUMNS ( { 1 }, "XXXXXXXXXX", ''[Value]) """;
var expression = """ SELECTCOLUMNS({0}, "__Measures", ''[Value]) """;
var expected = """ SELECTCOLUMNS({0}, "XXXXXXXXXX", ''[Value]) """;

var obfuscator = new DaxModelObfuscator(new Model());
obfuscator.Texts.Add(new DaxText("__Measures", "XXXXXXXXXX"));
Expand Down
Loading