Fix more tests

Author: HosseinYousefi

pkgs/jnigen/cmake/CMakeLists.txt.tmpl

@@ -6,17 +6,3 @@ cmake_minimum_required(VERSION 3.10)
 # Project-level configuration.
 set(PROJECT_NAME "pdfbox_plugin")
 project(${PROJECT_NAME} LANGUAGES CXX)
-
-# Invoke the build for native code shared with the other target platforms.
-# This can be changed to accomodate different builds.
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared")
-
-# List of absolute paths to libraries that should be bundled with the plugin.
-# This list could contain prebuilt libraries, or libraries created by an
-# external build triggered from this build file.
-set(pdfbox_plugin_bundled_libraries
-  # Defined in ../src/CMakeLists.txt.
-  # This can be changed to accomodate different builds.
-  $<TARGET_FILE:pdfbox_plugin>
-  PARENT_SCOPE
-)

pkgs/jnigen/cmake/README.md

@@ -7,17 +7,3 @@ cmake_minimum_required(VERSION 3.14)
 # Project-level configuration.
 set(PROJECT_NAME "pdfbox_plugin")
 project(${PROJECT_NAME} LANGUAGES CXX)
-
-# Invoke the build for native code shared with the other target platforms.
-# This can be changed to accomodate different builds.
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared")
-
-# List of absolute paths to libraries that should be bundled with the plugin.
-# This list could contain prebuilt libraries, or libraries created by an
-# external build triggered from this build file.
-set(pdfbox_plugin_bundled_libraries
-  # Defined in ../src/CMakeLists.txt.
-  # This can be changed to accomodate different builds.
-  $<TARGET_FILE:pdfbox_plugin>
-  PARENT_SCOPE
-)

pkgs/jnigen/example/pdfbox_plugin/lib/src/third_party/_init.dart

@@ -15,10 +15,8 @@ import 'test_util/test_util.dart';
 const packageTests = 'test';
 final jacksonCoreTests = absolute(packageTests, 'jackson_core_test');
 final thirdParty = absolute(jacksonCoreTests, 'third_party');
-final lib = absolute(thirdParty, 'c_based', 'dart_bindings');
-final src = absolute(thirdParty, 'c_based', 'c_bindings');
-final testLib = absolute(thirdParty, 'test_', 'c_based', 'dart_bindings');
-final testSrc = absolute(thirdParty, 'test_', 'c_based', 'c_bindings');
+final lib = absolute(thirdParty, 'bindings');
+final testLib = absolute(thirdParty, 'test_', 'bindings');
 
 /// Compares 2 [Config] objects using [expect] to give useful errors when
 /// two fields are not equal.
@@ -97,7 +95,6 @@ void main() async {
   final config = Config.parseArgs([
     '--config',
     jnigenYaml,
-    '-Doutput.c.path=$testSrc${Platform.pathSeparator}',
     '-Doutput.dart.path=$testLib${Platform.pathSeparator}',
   ]);
 
@@ -111,10 +108,6 @@ void main() async {
   });
 
   group('Test for config error checking', () {
-    testForErrorChecking<ConfigException>(
-      name: 'Invalid bindings type',
-      overrides: ['-Doutput.bindings_type=c_base'],
-    );
     testForErrorChecking<ConfigException>(
       name: 'Invalid output structure',
       overrides: ['-Doutput.dart.structure=singl_file'],

pkgs/jnigen/example/pdfbox_plugin/linux/CMakeLists.txt

@@ -6,7 +6,7 @@ maven_downloads:
 
 output:
   dart:
-    path: third_party/c_based/dart_bindings/
+    path: third_party/bindings/
 
 classes:
   - 'com.fasterxml.jackson.core.JsonFactory'