This is an automated email from the ASF dual-hosted git repository.
baunsgaard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new c46d71c [MINOR] Fix Privacy Tests
c46d71c is described below
commit c46d71c8354a2bc8e2554d643c83fa3a31876d21
Author: sebwrede <swr...@know-center.at>
AuthorDate: Fri Sep 18 09:45:47 2020 +0200
[MINOR] Fix Privacy Tests
This commit change the privacy tests, to include a separated target
directory for the federated parts of the data in privacy tests.
- Change Assert to AssertTrue in FederatedWorkerHandlerTest
- Edit Assert Calls in FederatedWorkerHandlerTest
- Change Target Directory for FederatedWorkerHandlerTest
- And change fields in CheckedConstraintsLog to final
Closes #1057
---
.../runtime/privacy/CheckedConstraintsLog.java | 6 +++---
.../privacy/FederatedWorkerHandlerTest.java | 23 ++++++++++++----------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git
a/src/main/java/org/apache/sysds/runtime/privacy/CheckedConstraintsLog.java
b/src/main/java/org/apache/sysds/runtime/privacy/CheckedConstraintsLog.java
index 7bb5687..3d0ec90 100644
--- a/src/main/java/org/apache/sysds/runtime/privacy/CheckedConstraintsLog.java
+++ b/src/main/java/org/apache/sysds/runtime/privacy/CheckedConstraintsLog.java
@@ -30,13 +30,13 @@ import
org.apache.sysds.runtime.privacy.PrivacyConstraint.PrivacyLevel;
* Class counting the checked privacy constraints and the loaded privacy
constraints.
*/
public class CheckedConstraintsLog {
- private static Map<PrivacyLevel,LongAdder> loadedConstraintsTotal = new
EnumMap<>(PrivacyLevel.class);
+ private static final Map<PrivacyLevel,LongAdder> loadedConstraintsTotal
= new EnumMap<>(PrivacyLevel.class);
static {
for ( PrivacyLevel level : PrivacyLevel.values() )
loadedConstraintsTotal.put(level, new LongAdder());
}
- private static Map<PrivacyLevel,LongAdder> checkedConstraintsTotal =
new EnumMap<>(PrivacyLevel.class);
- private static BiFunction<LongAdder, LongAdder, LongAdder>
mergeLongAdders = (v1, v2) -> {
+ private static final Map<PrivacyLevel,LongAdder>
checkedConstraintsTotal = new EnumMap<>(PrivacyLevel.class);
+ private static final BiFunction<LongAdder, LongAdder, LongAdder>
mergeLongAdders = (v1, v2) -> {
v1.add(v2.longValue() );
return v1;
};
diff --git
a/src/test/java/org/apache/sysds/test/functions/privacy/FederatedWorkerHandlerTest.java
b/src/test/java/org/apache/sysds/test/functions/privacy/FederatedWorkerHandlerTest.java
index 07f18fe..d4f3862 100644
---
a/src/test/java/org/apache/sysds/test/functions/privacy/FederatedWorkerHandlerTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/privacy/FederatedWorkerHandlerTest.java
@@ -33,14 +33,16 @@ import org.junit.Test;
import org.apache.sysds.common.Types;
import static java.lang.Thread.sleep;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
@net.jcip.annotations.NotThreadSafe
public class FederatedWorkerHandlerTest extends AutomatedTestBase {
- private static final String TEST_DIR = "functions/federated/";
- private static final String TEST_DIR_SCALAR = TEST_DIR +
"matrix_scalar/";
+ private static final String TEST_DIR = "functions/privacy/";
+ private static final String TEST_DIR_fed = "functions/federated/";
+ private static final String TEST_DIR_SCALAR = TEST_DIR_fed +
"matrix_scalar/";
private final static String TEST_CLASS_DIR = TEST_DIR +
FederatedWorkerHandlerTest.class.getSimpleName() + "/";
- private final static String TEST_CLASS_DIR_SCALAR = TEST_DIR_SCALAR +
FederatedWorkerHandlerTest.class.getSimpleName() + "/";
+ private final static String TEST_CLASS_DIR_SCALAR = TEST_DIR +
FederatedWorkerHandlerTest.class.getSimpleName() + "/";
private static final String TEST_PROG_SCALAR_ADDITION_MATRIX =
"FederatedScalarAdditionMatrix";
private final static String AGGREGATION_TEST_NAME = "FederatedSumTest";
private final static String TRANSFER_TEST_NAME = "FederatedRCBindTest";
@@ -123,8 +125,7 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
if ( !exceptionExpected )
compareResults();
} catch (InterruptedException e) {
- e.printStackTrace();
- assert (false);
+ fail("InterruptedException thrown" + e.getMessage() + "
" + Arrays.toString(e.getStackTrace()));
} finally {
assertTrue("The privacy level " +
privacyLevel.toString() + " should have been checked during execution",
checkedPrivacyConstraintsContains(privacyLevel));
@@ -156,7 +157,7 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
getAndLoadTestConfiguration("aggregation");
- String HOME = SCRIPT_DIR + TEST_DIR;
+ String HOME = SCRIPT_DIR + TEST_DIR_fed;
double[][] A = getRandomMatrix(rows, cols, -10, 10, 1, 1);
writeInputMatrixWithMTD("A", A, false, new
MatrixCharacteristics(rows, cols, blocksize, rows * cols), new
PrivacyConstraint(privacyLevel));
@@ -226,7 +227,7 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
getAndLoadTestConfiguration("transfer");
- String HOME = SCRIPT_DIR + TEST_DIR;
+ String HOME = SCRIPT_DIR + TEST_DIR_fed;
double[][] A = getRandomMatrix(rows, cols, -10, 10, 1, 1);
writeInputMatrixWithMTD("A", A, false, new
MatrixCharacteristics(rows, cols, blocksize, rows * cols), new
PrivacyConstraint(privacyLevel));
@@ -259,7 +260,8 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
if ( expectedException == null )
compareResults(1e-11);
- assert(checkedPrivacyConstraintsContains(privacyLevel));
+ assertTrue("Privacy constraint with level " + privacyLevel + "
should have been checked during execution",
+ checkedPrivacyConstraintsContains(privacyLevel));
TestUtils.shutdownThread(t);
rtplatform = platformOld;
@@ -292,7 +294,7 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
Thread t1, t2;
getAndLoadTestConfiguration("matvecmult");
- String HOME = SCRIPT_DIR + TEST_DIR;
+ String HOME = SCRIPT_DIR + TEST_DIR_fed;
// write input matrices
int halfRows = rows / 2;
@@ -337,7 +339,8 @@ public class FederatedWorkerHandlerTest extends
AutomatedTestBase {
if (expectedException == null)
compareResults(1e-9);
- assert(checkedPrivacyConstraintsContains(privacyLevel));
+ assertTrue("Privacy constraint with level " + privacyLevel + "
should have been checked during execution",
+ checkedPrivacyConstraintsContains(privacyLevel));
TestUtils.shutdownThreads(t1, t2);
