Update repr tests and format

Beat Buesser · Beat Buesser · commit 7748000cfc75 · 2021-02-17T21:32:10.000Z
Signed-off-by: Beat Buesser &lt;beat.buesser@ie.ibm.com&gt;
diff --git a/art/estimators/tensorflow.py b/art/estimators/tensorflow.py
@@ -304,7 +304,9 @@ def _apply_preprocessing_gradient(self, x, gradients, fit=False):
 
         elif len(self.preprocessing_operations) == 1 or (
             len(self.preprocessing_operations) == 2
-            and isinstance(self.preprocessing_operations[-1], (StandardisationMeanStd, StandardisationMeanStdTensorFlowV2))
+            and isinstance(
+                self.preprocessing_operations[-1], (StandardisationMeanStd, StandardisationMeanStdTensorFlowV2)
+            )
         ):
             # Compatible with non-TensorFlow defences if no chaining.
             for preprocess in self.preprocessing_operations[::-1]:
diff --git a/tests/estimators/classification/test_blackbox.py b/tests/estimators/classification/test_blackbox.py
@@ -91,7 +91,7 @@ def test_repr(self):
         self.assertIn("clip_values=[  0. 255.]", repr_)
         self.assertIn("defences=None", repr_)
         self.assertIn(
-            "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_
+            "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_
         )
 
 
diff --git a/tests/estimators/classification/test_classifier.py b/tests/estimators/classification/test_classifier.py
@@ -118,7 +118,7 @@ def test_repr(self):
         self.assertIn("clip_values=None", repr_)
         self.assertIn("defences=None", repr_)
         self.assertIn(
-            "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_
+            "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_
         )
 
 
@@ -147,7 +147,7 @@ def test_repr(self):
         self.assertIn("clip_values=[0. 1.]", repr_)
         self.assertIn("defences=None", repr_)
         self.assertIn(
-            "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_
+            "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_
         )
 
 
diff --git a/tests/estimators/classification/test_detector_classifier.py b/tests/estimators/classification/test_detector_classifier.py
@@ -168,7 +168,7 @@ def test_repr(self):
         repr_ = repr(self.detector_classifier)
         self.assertIn("art.estimators.classification.detector_classifier.DetectorClassifier", repr_)
         self.assertIn(
-            "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_
+            "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_
         )
 
 
diff --git a/tests/estimators/classification/test_ensemble.py b/tests/estimators/classification/test_ensemble.py
@@ -255,8 +255,8 @@ def test_repr(self):
         self.assertIn("classifier_weights=array([0.5, 0.5])", repr_)
         self.assertIn(
             f"channel_index={Deprecated}, channels_first=False, clip_values=array([0., 1.], dtype=float32), "
-            "preprocessing_defences=None, postprocessing_defences=None, preprocessing=[StandardisationMeanStd(mean=0, "
-            "std=1, apply_fit=True, apply_predict=True)]",
+            "preprocessing_defences=None, postprocessing_defences=None, preprocessing=StandardisationMeanStd(mean=0, "
+            "std=1, apply_fit=True, apply_predict=True)",
             repr_,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def test_repr(self):`
`91`	`91`	`self.assertIn("clip_values=[ 0. 255.]", repr_)`
`92`	`92`	`self.assertIn("defences=None", repr_)`
`93`	`93`	`self.assertIn(`
`94`		`- "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_`
	`94`	`+ "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_`
`95`	`95`	`)`
`96`	`96`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ def test_repr(self):`
`118`	`118`	`self.assertIn("clip_values=None", repr_)`
`119`	`119`	`self.assertIn("defences=None", repr_)`
`120`	`120`	`self.assertIn(`
`121`		`- "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_`
	`121`	`+ "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_`
`122`	`122`	`)`
`123`	`123`
`124`	`124`
`@@ -147,7 +147,7 @@ def test_repr(self):`
`147`	`147`	`self.assertIn("clip_values=[0. 1.]", repr_)`
`148`	`148`	`self.assertIn("defences=None", repr_)`
`149`	`149`	`self.assertIn(`
`150`		`- "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_`
	`150`	`+ "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_`
`151`	`151`	`)`
`152`	`152`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ def test_repr(self):`
`168`	`168`	`repr_ = repr(self.detector_classifier)`
`169`	`169`	`self.assertIn("art.estimators.classification.detector_classifier.DetectorClassifier", repr_)`
`170`	`170`	`self.assertIn(`
`171`		`- "preprocessing=[StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)]", repr_`
	`171`	`+ "preprocessing=StandardisationMeanStd(mean=0, std=1, apply_fit=True, apply_predict=True)", repr_`
`172`	`172`	`)`
`173`	`173`
`174`	`174`