1 files changed, 10 insertions, 46 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java
index 86895460dce..bfbf539074c 100755
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
-import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 
@@ -14,81 +13,47 @@ public class AnnotationsTestCase extends AbstractExportingTestCase {
 
     @Test
     public void requireThatStructRegistersIfOnlyUsedByAnnotation() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsstruct",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsstruct",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsstruct");
     }
 
     @Test
     public void requireThatStructRegistersIfOnlyUsedAsArrayByAnnotation() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsstructarray",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsstructarray",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsstructarray");
     }
 
     @Test
     public void testSimpleAnnotationDeriving() throws IOException, ParseException {
-        assertCorrectDeriving("annotationssimple",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationssimple",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationssimple");
     }
 
     @Test
     public void testAnnotationDerivingWithImplicitStruct() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsimplicitstruct",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsimplicitstruct",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsimplicitstruct");
     }
 
     @Test
     public void testAnnotationDerivingInheritance() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsinheritance",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsinheritance",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsinheritance");
     }
 
     @Test
     public void testAnnotationDerivingInheritance2() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsinheritance2",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsinheritance2",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsinheritance2");
     }
 
     @Test
     public void testSimpleReference() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsreference",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationsreference",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationsreference");
     }
 
     @Test
     public void testAdvancedReference() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsreference2",
-                              new TestProperties().setExperimentalSdParsing(true));
+        assertCorrectDeriving("annotationsreference2");
     }
 
     @Test
     public void testAnnotationsPolymorphy() throws IOException, ParseException {
-        assertCorrectDeriving("annotationspolymorphy",
-                              new TestProperties().setExperimentalSdParsing(true));
-        assertCorrectDeriving("annotationspolymorphy",
-                              new TestProperties().setExperimentalSdParsing(false));
-    }
-
-    /**
-     * An annotation declared before document {} won't work, no doc type to add it to.
-     */
-    @Test(expected = IllegalArgumentException.class)    
-    public void testAnnotationOutsideOfDocumentOld() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsoutsideofdocument",
-                              new TestProperties().setExperimentalSdParsing(false));
+        assertCorrectDeriving("annotationspolymorphy");
     }
 
     /**
@@ -96,7 +61,6 @@ public class AnnotationsTestCase extends AbstractExportingTestCase {
      */
     @Test
     public void testAnnotationOutsideOfDocumentNew() throws IOException, ParseException {
-        assertCorrectDeriving("annotationsoutsideofdocument",
-                              new TestProperties().setExperimentalSdParsing(true));
+        assertCorrectDeriving("annotationsoutsideofdocument");
     }
 }