Revert "Bratseth/model syntax"

2 files changed, 2 insertions, 36 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java
index 2284acc705c..17d94639d87 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/parser/SchemaParserTestCase.java
@@ -93,7 +93,6 @@ public class SchemaParserTestCase {
         assertNotEquals("", schema.name());
     }
 
-    // TODO: Many (all)? of the files below are parsed from other tests and can be removed from here
     @Test
     public void parse_various_old_sdfiles() throws Exception {
         checkFileParses("src/test/cfg/search/data/travel/schemas/TTData.sd");
@@ -181,6 +180,7 @@ public class SchemaParserTestCase {
         checkFileParses("src/test/derived/namecollision/collision.sd");
         checkFileParses("src/test/derived/namecollision/collisionstruct.sd");
         checkFileParses("src/test/derived/nearestneighbor/test.sd");
+        checkFileParses("src/test/derived/neuralnet/neuralnet.sd");
         checkFileParses("src/test/derived/newrank/newrank.sd");
         checkFileParses("src/test/derived/nuwa/newsindex.sd");
         checkFileParses("src/test/derived/orderilscripts/orderilscripts.sd");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
index 5bf2115c3f7..114486a5ddc 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithTensorTestCase.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.fail;
 public class RankingExpressionWithTensorTestCase {
 
     @Test
-    public void requireThatSingleLineConstantMappedTensorCanBeParsed() throws ParseException {
+    public void requireThatSingleLineConstantTensorAndTypeCanBeParsed() throws ParseException {
         RankProfileSearchFixture f = new RankProfileSearchFixture(
                 "  rank-profile my_profile {\n" +
                 "    first-phase {\n" +
@@ -30,40 +30,6 @@ public class RankingExpressionWithTensorTestCase {
     }
 
     @Test
-    public void requireThatSingleLineConstantIndexedTensorCanBeParsed() throws ParseException {
-        RankProfileSearchFixture f = new RankProfileSearchFixture(
-                "  rank-profile my_profile {\n" +
-                "    first-phase {\n" +
-                "      expression: sum(my_tensor)\n" +
-                "    }\n" +
-                "    constants {\n" +
-                "      my_tensor tensor(x[3]):{ {x:0}:1, {x:1}:2, {x:2}:3 }\n" +
-                "    }\n" +
-                "  }");
-        f.compileRankProfile("my_profile");
-        f.assertFirstPhaseExpression("reduce(constant(my_tensor), sum)", "my_profile");
-        f.assertRankProperty("tensor(x[3]):[1.0, 2.0, 3.0]", "constant(my_tensor).value", "my_profile");
-        f.assertRankProperty("tensor(x[3])", "constant(my_tensor).type", "my_profile");
-    }
-
-    @Test
-    public void requireThatSingleLineConstantIndexedTensorShortFormCanBeParsed() throws ParseException {
-        RankProfileSearchFixture f = new RankProfileSearchFixture(
-                "  rank-profile my_profile {\n" +
-                "    first-phase {\n" +
-                "      expression: sum(my_tensor)\n" +
-                "    }\n" +
-                "    constants {\n" +
-                "      my_tensor tensor(x[3]):[1, 2, 3]\n" +
-                "    }\n" +
-                "  }");
-        f.compileRankProfile("my_profile");
-        f.assertFirstPhaseExpression("reduce(constant(my_tensor), sum)", "my_profile");
-        f.assertRankProperty("tensor(x[3]):[1.0, 2.0, 3.0]", "constant(my_tensor).value", "my_profile");
-        f.assertRankProperty("tensor(x[3])", "constant(my_tensor).type", "my_profile");
-    }
-
-    @Test
     public void requireConstantTensorCanBeReferredViaConstantFeature() throws ParseException {
         RankProfileSearchFixture f = new RankProfileSearchFixture(
                 "  rank-profile my_profile {\n" +